Merge remote-tracking branch 'origin/master'

Conflicts:
	ionic/components/nav/nav-item.js
	ionic/components/view/view.scss

ionic/components/view/lifecycle.js

@@ -0,0 +1,14 @@
+export class Lifecycle {
+  static viewLoaded(component) {
+    component.viewLoaded && component.viewLoaded();
+  }
+  static viewWillShow(component) {
+    component.viewWillShow && component.viewWillShow();
+  }
+  static viewEntered(component) {
+    component.viewEntered && component.viewEntered();
+  }
+  static viewDestroyed(component) {
+    component.viewDestroyed && component.viewDestroyed();
+  }
+}

ionic/components/view/view.scss.orig

@@ -0,0 +1,30 @@
+
+ion-view {
+  display: flex;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+
+  background-color: white;
+<<<<<<< HEAD
+=======
+
+  // by default this is display: none;
+  // and the transition animation will display it
+  //display: none;
+  flex-direction: column;
+
+  display: flex;
+
+  /*
+  TODO: This is probably not the most common case,
+        should be display flex first, then remove for special cases.
+  &.show-view {
+    display: flex;
+  }
+  */
+
+>>>>>>> origin/master
+}