Merge branch 'master' into list-border-refactor

ionic/components/icon/icon.ts

@@ -60,9 +60,6 @@ export class Icon {
     this.update();
   }
 
-  /**
-   * @private
-   */
   get isActive() {
     return (this._isActive === undefined || this._isActive === true || this._isActive === 'true');
   }

ionic/components/nav/nav.ts

@@ -41,7 +41,7 @@ import {ViewController} from './view-controller';
  *
  * Additionally, specifying the `swipe-back-enabled` property will allow you to
  * swipe to go back:
- * ```ts
+ * ```html
  * <ion-nav swipe-back-enabled="false" [root]="rootPage"></ion-nav>
  * ```
  *

ionic/components/tabs/tabs.ts

@@ -26,7 +26,7 @@ import {Icon} from '../icon/icon';
  * To override the platform specific TabBar placement, use the
  * `tabbar-placement` property:
  *
- * ```ts
+ * ```html
  * <ion-tabs tabbar-placement="top">
  *   <ion-tab [root]="tabRoot"></ion-tab>
  * </ion-tabs>
@@ -34,7 +34,7 @@ import {Icon} from '../icon/icon';
  *
  * To change the location of the icons in the TabBar, use the `tabbar-icons`
  * property:
- * ```ts
+ * ```html
  * <ion-tabs tabbar-icons="bottom">
  *   <ion-tab [root]="tabRoot"></ion-tab>
  * </ion-tabs>