Merge branch 'master' into css-refactor

ionic/components/nav/nav-push.ts

@@ -36,7 +36,9 @@ import {NavRegistry} from './nav-registry';
  * ```html
  * <button [nav-push]="[pushPage, params]"></button>
  * ```
+ * @demo /docs/v2/demos/nav-push-pop/
  * @see {@link /docs/v2/components#navigation Navigation Component Docs}
+ * @see {@link ../NavPop NavPop API Docs}
  */
 @Directive({
   selector: '[nav-push]',
@@ -87,6 +89,9 @@ export class NavPush {
 
 /**
  * TODO
+ * @demo /docs/v2/demos/nav-push-pop/
+ * @see {@link /docs/v2/components#navigation Navigation Component Docs}
+ * @see {@link ../NavPush NavPush API Docs}
  */
 @Directive({
   selector: '[nav-pop]',

ionic/gestures/hammer.ts

@@ -2,9 +2,7 @@
  * http://hammerjs.github.io/
  *
  * Copyright (c) 2014 Jorik Tangelder;
- * Licensed under the MIT license */
-//(function(window, document, exportName, undefined) {
-//'use strict';
+ * Licensed under the MIT license */
 
 var VENDOR_PREFIXES = ['', 'webkit', 'moz', 'MS', 'ms', 'o'];
 var TEST_ELEMENT = document.createElement('div');
@@ -2452,19 +2450,8 @@ extend(Hammer, {
     bindFn: bindFn,
     prefixed: prefixed
 });
+
+// attach to window for angular2 gesture listeners
+window.Hammer = Hammer;
 
-/*
-if (typeof define == TYPE_FUNCTION && define.amd) {
-    define(function() {
-        return Hammer;
-    });
-} else if (typeof module != 'undefined' && module.exports) {
-    module.exports = Hammer;
-} else {
-    window[exportName] = Hammer;
-}
-*/
-
-export {Hammer};
-
-//})(window, document, 'Hammer');
+export {Hammer};

ionic/platform/storage/local-storage.ts

@@ -10,6 +10,8 @@ import {StorageEngine} from './storage';
  * by the operating system (iOS).
  *
  * For guaranteed, long-term storage, use the SqlStorage engine which stores data in a file.
+ * @demo /docs/v2/demos/local-storage/
+ * @see {@link /docs/v2/platform/storage/ Storage Platform Docs}
  */
 export class LocalStorage extends StorageEngine {
   constructor() {