Merge remote-tracking branch 'origin/2.0' into 2.0

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

CHANGELOG.md

@@ -80,6 +80,8 @@
   All methods have been documented in the API docs:
   http://ionicframework.com/docs/v2/api/components/slides/Slides/
 
+* **platform:** `platform.versions()` no longer accepts an optional parameter for platform name
+and now returns only an object containing all of the platforms and their versions.
 
 <a name="2.0.0-beta.4"></a>
 # [2.0.0-beta.4](https://github.com/driftyco/ionic/compare/v2.0.0-beta.3...v2.0.0-beta.4) (2016-04-07)

demos/toast/index.ts

@@ -35,7 +35,7 @@ class ApiPage {
 
   showToastWithCloseButton() {
     const toast = Toast.create({
-      message: 'Your internet connection appears to be offline. Data integrity is not gauranteed.',
+      message: 'Your internet connection appears to be offline. Data integrity is not guaranteed.',
       showCloseButton: true,
       closeButtonText: 'Ok'
     });

ionic/components/action-sheet/action-sheet.ts

@@ -122,7 +122,7 @@ import {ViewController} from '../nav/view-controller';
  * this.nav.present(actionSheet);
  * ```
  *
- * It's important to note that the the handler returns `false`. A feature of
+ * It's important to note that the handler returns `false`. A feature of
  * button handlers is that they automatically dismiss the action sheet when their button
  * was clicked, however, we'll need more control regarding the transition. Because
  * the handler returns `false`, then the action sheet does not automatically dismiss

ionic/components/alert/alert.ts

@@ -175,7 +175,7 @@ import {ViewController} from '../nav/view-controller';
  * this.nav.present(alert);
  * ```
  *
- * It's important to note that the the handler returns `false`. A feature of
+ * It's important to note that the handler returns `false`. A feature of
  * button handlers is that they automatically dismiss the alert when their button
  * was clicked, however, we'll need more control regarding the transition. Because
  * the handler returns `false`, then the alert does not automatically dismiss

ionic/components/label/label.ts

@@ -7,9 +7,9 @@ import {Directive, ElementRef, Renderer, Input, Optional, Attribute} from 'angul
  * Labels are placed inside of an `ion-item` element and can be used
  * to describe an `ion-input`, `ion-toggle`, `ion-checkbox`, and more.
  *
- * @property [fixed] - a persistant label that sits next the the input
- * @property [floating] - a label that will float about the input if the input is empty of looses focus
- * @property [stacked] - A stacked label will always appear on top of the input
+ * @property [fixed] - A persistant label that sits next the input.
+ * @property [floating] - A label that will float about the input if the input is empty of looses focus.
+ * @property [stacked] - A stacked label will always appear on top of the input.
 
  *
  * @usage

ionic/components/nav/nav-controller.ts

@@ -1399,7 +1399,7 @@ export class NavController extends Ion {
     }
     this._views.length = 0;
 
-    if (this.parent) {
+    if (this.parent && this.parent.unregisterChildNav) {
       this.parent.unregisterChildNav(this);
     }
   }

ionic/platform/platform.ts

@@ -152,9 +152,7 @@ export class Platform {
    * }
    * ```
    *
-   * @param {string} [platformName] optional platformName
-   * @returns {object} An object with various platform info
-   *
+   * @returns {object} An object containing all of the platforms and their versions.
    */
   versions(): {[name: string]: PlatformVersion} {
     // get all the platforms that have a valid parsed version