Merge branch 'master' into searchbar-fix

# Conflicts:
#	ionic/components/searchbar/searchbar.ts

ionic/components/checkbox/checkbox.ts

@@ -1,4 +1,5 @@
-import {Component, Directive, Optional, NgControl, ElementRef} from 'angular2/angular2';
+import {Component, Directive, Optional, ElementRef} from 'angular2/core';
+import {NgControl} from 'angular2/common';
 
 import {Ion} from '../ion';
 import {Form} from '../../util/form';

ionic/components/checkbox/test/basic/index.ts

@@ -9,7 +9,8 @@ import {
   NgControlName,
   NgFormModel,
   FormBuilder
-} from 'angular2/angular2';
+} from 'angular2/common';
+
 
 @App({
   templateUrl: 'main.html'