Merge branch 'master' into css-refactor

# Conflicts:
#	ionic/components/button/modes/ios.scss

ionic/components/button/button.ts

@@ -22,6 +22,7 @@ import {Toolbar} from '../toolbar/toolbar';
   * @property [fab-bottom] - position a fab button towards the bottom
   * @description
   * Buttons are simple components in Ionic, can consist of text, an icon, or both, and can be enhanced with a wide range of attributes.
+  * @demo /docs/v2/demos/buttons/
   * @see {@link /docs/v2/components#buttons Button Component Docs}
 
  */

ionic/components/modal/modal.ts

@@ -33,6 +33,7 @@ import {extend} from 'ionic/util';
  *
  * }
  * ```
+ * @demo /docs/v2/demos/modal/
  * @see {@link /docs/v2/components#modals Modal Component Docs}
  */
 @Injectable()