Merge branch 'master' into css-refactor

ionic/components/blur/blur.ts

@@ -1,5 +1,12 @@
 import {Directive, Renderer, ElementRef} from 'angular2/angular2';
 
+
+/**
+ * The blur attribute applies the CSS blur attribute to an element. If the CSS attribute is not supported,
+ * it will fall back to applying a semi-transparent background color to the element.
+ *
+ * @demo /docs/v2/demos/blur/
+ */
 @Directive({
   selector: '[ion-blur]'
 })

ionic/components/popup/popup.ts

@@ -61,6 +61,7 @@ import {extend} from '../../util/util';
  *   }
  * }
  * ```
+ * @demo /docs/v2/demos/popup/
  * @see {@link /docs/v2/components#popups Popup Component Docs}
  */
 @Injectable()