fix rebase issues

Author: mmalerba

src/demo-app/select/select-demo.html

@@ -33,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>
 
@@ -111,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>

src/lib/select/select.ts

@@ -679,7 +679,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);
     });
   }