From 6ab623272c6ec79603d42ca65f4363d918c5aed4 Mon Sep 17 00:00:00 2001
From: Dan Bucholtz <dan.bucholtz@gmail.com>
Date: Wed, 3 Jan 2018 13:56:44 -0600
Subject: [PATCH] chore(conf-app): progress

---
 .../conference-app/angular/package-lock.json  | 324 +++++++++++-------
 .../demos/conference-app/angular/package.json |  28 +-
 .../conference-app/angular/src/index.html     |   1 +
 .../src/pages/about-popover/about-popover.ts  |  20 +-
 .../angular/src/pages/about/about.html        |  21 +-
 .../angular/src/pages/map/map.html            |   6 +-
 .../angular/src/pages/map/map.scss            |  28 +-
 .../angular/src/pages/map/map.ts              |  65 ++--
 .../schedule-filter/schedule-filter.html      |  14 +-
 .../angular/src/pages/schedule/schedule.html  |  33 +-
 .../angular/src/pages/schedule/schedule.ts    |   4 +-
 .../pages/speaker-detail/speaker-detail.html  |  16 +-
 .../src/pages/speaker-list/speaker-list.html  |  26 +-
 .../src/pages/speaker-list/speaker-list.ts    |   2 +-
 14 files changed, 334 insertions(+), 254 deletions(-)

diff --git a/packages/demos/conference-app/angular/package-lock.json b/packages/demos/conference-app/angular/package-lock.json
index 87e77f4368..c3c9ef6c04 100644
--- a/packages/demos/conference-app/angular/package-lock.json
+++ b/packages/demos/conference-app/angular/package-lock.json
@@ -55,15 +55,15 @@
       }
     },
     "@angular/cli": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.6.2.tgz",
-      "integrity": "sha512-Qc6AD37ASJjhbYkDgWQOniEl+XDLWDydqPOZ0kPQhbrJk49PoM1HNZfCD1FmIZFTT/eFEVsaexc/rKw0KckvSA==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.6.3.tgz",
+      "integrity": "sha512-At0/Q8CsldsvekOmAnYF8g7BAf0aHJImPLstxzPeWdg7EZbQxwCH0I+ZSZFHL43f8md6n9JmSeUWrlwANs+bHw==",
       "dev": true,
       "requires": {
         "@angular-devkit/build-optimizer": "0.0.36",
         "@angular-devkit/schematics": "0.0.42",
         "@ngtools/json-schema": "1.1.0",
-        "@ngtools/webpack": "1.9.2",
+        "@ngtools/webpack": "1.9.3",
         "@schematics/angular": "0.1.11",
         "autoprefixer": "6.7.7",
         "chalk": "2.2.2",
@@ -109,7 +109,7 @@
         "style-loader": "0.13.2",
         "stylus": "0.54.5",
         "stylus-loader": "3.0.1",
-        "uglifyjs-webpack-plugin": "1.1.4",
+        "uglifyjs-webpack-plugin": "1.1.5",
         "url-loader": "0.6.2",
         "webpack": "3.10.0",
         "webpack-dev-middleware": "1.12.2",
@@ -117,7 +117,7 @@
         "webpack-merge": "4.1.1",
         "webpack-sources": "1.1.0",
         "webpack-subresource-integrity": "1.0.3",
-        "zone.js": "0.8.18"
+        "zone.js": "0.8.19"
       },
       "dependencies": {
         "ansi-styles": {
@@ -289,29 +289,6 @@
       "integrity": "sha512-PdV5ITq4oCFKNKCUg2/6GneRrCUQEWgfZeukcyIx0V+LbalZ1DUKtn94M74Bfjz/4rFk86G21aIlrq5PCVWZMg==",
       "requires": {
         "@stencil/core": "0.1.1-0"
-      },
-      "dependencies": {
-        "@stencil/core": {
-          "version": "0.1.1-0",
-          "resolved": "https://registry.npmjs.org/@stencil/core/-/core-0.1.1-0.tgz",
-          "integrity": "sha512-F4frvyNcIJoWO+ht2Hw8nT7TS7IN0/WKx4vGUbdKWnSvIN4/V+gO5pu/Um3MccSEDFnp+VYMKEZk99scF2wX2g==",
-          "requires": {
-            "chokidar": "1.7.0",
-            "jsdom": "11.3.0",
-            "node-sass": "4.5.3",
-            "rollup": "0.50.0",
-            "rollup-plugin-commonjs": "8.2.5",
-            "rollup-plugin-node-resolve": "3.0.0",
-            "typescript": "2.6.2",
-            "uglify-es": "3.1.6",
-            "workbox-build": "2.1.1"
-          }
-        },
-        "typescript": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
-          "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q="
-        }
       }
     },
     "@ionic/core": {
@@ -336,9 +313,9 @@
       "dev": true
     },
     "@ngtools/webpack": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.9.2.tgz",
-      "integrity": "sha512-jM5XMwHt94qxIe9kJS3Bmz8EfZgsC2H7fVcTSEd/dgyL5C89uZJfj5ueO9yEERpnXufvALBMfUxfODTcPX01iw==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.9.3.tgz",
+      "integrity": "sha512-LOOc8eXkieY0Uh0lis8SqRvDhsDwb1CK31Fn55i0kfdzjeyGARidIYNGskO//bPMvLoWJYYpCl+jnDodtLpiLg==",
       "dev": true,
       "requires": {
         "chalk": "2.2.2",
@@ -347,7 +324,8 @@
         "magic-string": "0.22.4",
         "semver": "5.4.1",
         "source-map": "0.5.7",
-        "tree-kill": "1.2.0"
+        "tree-kill": "1.2.0",
+        "webpack-sources": "1.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -478,9 +456,9 @@
       }
     },
     "acorn": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
-      "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w=="
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
+      "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug=="
     },
     "acorn-dynamic-import": {
       "version": "2.0.2",
@@ -504,7 +482,7 @@
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.1.0.tgz",
       "integrity": "sha512-KjZwU26uG3u6eZcfGbTULzFcsoz6pegNKtHPksZPOUsiKo5bUmiBPa38FuHZ/Eun+XYh/JCCkS9AS3Lu4McQOQ==",
       "requires": {
-        "acorn": "5.2.1"
+        "acorn": "5.3.0"
       }
     },
     "adm-zip": {
@@ -4449,9 +4427,9 @@
       "dev": true
     },
     "html-minifier": {
-      "version": "3.5.7",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.7.tgz",
-      "integrity": "sha512-GISXn6oKDo7+gVpKOgZJTbHMCUI2TSGfpg/8jgencWhWJsvEmsvp3M8emX7QocsXsYznWloLib3OeSfeyb/ewg==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.8.tgz",
+      "integrity": "sha512-WX7D6PB9PFq05fZ1/CyxPUuyqXed6vh2fGOM80+zJT5wAO93D/cUjLs0CcbBFjQmlwmCgRvl97RurtArIpOnkw==",
       "dev": true,
       "requires": {
         "camel-case": "3.0.0",
@@ -4461,7 +4439,7 @@
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.2.2"
+        "uglify-js": "3.3.4"
       },
       "dependencies": {
         "commander": {
@@ -4477,9 +4455,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.2.tgz",
-          "integrity": "sha512-++1NO/zZIEdWf6cDIGceSJQPX31SqIpbVAHwFG5+240MtZqPG/NIPoinj8zlXQtAfMBqEt1Jyv2FiLP3n9gVhQ==",
+          "version": "3.3.4",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.4.tgz",
+          "integrity": "sha512-hfIwuAQI5dlXP30UtdmWoYF9k+ypVqBXIdmd6ZKBiaNHHvA8ty7ZloMe3+7S5AEKVkxHbjByl4DfRHQ7QpZquw==",
           "dev": true,
           "requires": {
             "commander": "2.12.2",
@@ -4495,7 +4473,7 @@
       "dev": true,
       "requires": {
         "bluebird": "3.5.1",
-        "html-minifier": "3.5.7",
+        "html-minifier": "3.5.8",
         "loader-utils": "0.2.17",
         "lodash": "4.17.4",
         "pretty-error": "2.1.1",
@@ -4678,7 +4656,7 @@
       "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.14"
+        "postcss": "6.0.15"
       },
       "dependencies": {
         "ansi-styles": {
@@ -4699,17 +4677,28 @@
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
             "supports-color": "4.5.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "4.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+              "dev": true,
+              "requires": {
+                "has-flag": "2.0.0"
+              }
+            }
           }
         },
         "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "version": "6.0.15",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
+          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
           "dev": true,
           "requires": {
             "chalk": "2.3.0",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.1.0"
           }
         },
         "source-map": {
@@ -4719,9 +4708,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
+          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -5330,7 +5319,7 @@
       "integrity": "sha512-aPZTDl4MplzQhx5bLztk6nzjbEslmO3Q3+z0WpCMutL1XJDhZIRzir6R1Y8S84LgeT/7jhQvgtUMkY6oPwvlUw==",
       "requires": {
         "abab": "1.0.4",
-        "acorn": "5.2.1",
+        "acorn": "5.3.0",
         "acorn-globals": "4.1.0",
         "array-equal": "1.0.0",
         "content-type-parser": "1.0.2",
@@ -5516,9 +5505,9 @@
       }
     },
     "karma-coverage-istanbul-reporter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.3.0.tgz",
-      "integrity": "sha1-0ULNnFVzHJ42Pvc3To7xoxvr+ts=",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.3.3.tgz",
+      "integrity": "sha512-MFkB6bh11J8nKygUdqyHb9sMz17XoBRYR4tiNxnSpi/UtDk0wk8eRGa0jRSJaILgCl4xyq1TL6Jidww1OWly/Q==",
       "dev": true,
       "requires": {
         "istanbul-api": "1.2.1",
@@ -6057,9 +6046,9 @@
       }
     },
     "make-error": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz",
-      "integrity": "sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz",
+      "integrity": "sha512-l9ra35l5VWLF24y75Tg8XgfGLX0ueRhph118WKM6H5denx4bB5QF59+4UAm9oJ2qsPQZas/CQUDdtDdfvYHBdQ==",
       "dev": true
     },
     "map-obj": {
@@ -7052,7 +7041,7 @@
       "dev": true,
       "requires": {
         "balanced-match": "1.0.0",
-        "postcss": "6.0.14"
+        "postcss": "6.0.15"
       },
       "dependencies": {
         "ansi-styles": {
@@ -7073,17 +7062,28 @@
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
             "supports-color": "4.5.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "4.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+              "dev": true,
+              "requires": {
+                "has-flag": "2.0.0"
+              }
+            }
           }
         },
         "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "version": "6.0.15",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
+          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
           "dev": true,
           "requires": {
             "chalk": "2.3.0",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.1.0"
           }
         },
         "source-map": {
@@ -7093,9 +7093,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
+          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -7198,7 +7198,7 @@
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
-        "postcss": "6.0.14",
+        "postcss": "6.0.15",
         "postcss-load-config": "1.2.0",
         "schema-utils": "0.3.0"
       },
@@ -7221,17 +7221,28 @@
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
             "supports-color": "4.5.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "4.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+              "dev": true,
+              "requires": {
+                "has-flag": "2.0.0"
+              }
+            }
           }
         },
         "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "version": "6.0.15",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
+          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
           "dev": true,
           "requires": {
             "chalk": "2.3.0",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.1.0"
           }
         },
         "source-map": {
@@ -7241,9 +7252,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
+          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -7341,7 +7352,7 @@
       "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.14"
+        "postcss": "6.0.15"
       },
       "dependencies": {
         "ansi-styles": {
@@ -7362,17 +7373,28 @@
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
             "supports-color": "4.5.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "4.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+              "dev": true,
+              "requires": {
+                "has-flag": "2.0.0"
+              }
+            }
           }
         },
         "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "version": "6.0.15",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
+          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
           "dev": true,
           "requires": {
             "chalk": "2.3.0",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.1.0"
           }
         },
         "source-map": {
@@ -7382,9 +7404,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
+          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -7399,7 +7421,7 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.14"
+        "postcss": "6.0.15"
       },
       "dependencies": {
         "ansi-styles": {
@@ -7420,17 +7442,28 @@
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
             "supports-color": "4.5.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "4.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+              "dev": true,
+              "requires": {
+                "has-flag": "2.0.0"
+              }
+            }
           }
         },
         "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "version": "6.0.15",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
+          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
           "dev": true,
           "requires": {
             "chalk": "2.3.0",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.1.0"
           }
         },
         "source-map": {
@@ -7440,9 +7473,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
+          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -7457,7 +7490,7 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.14"
+        "postcss": "6.0.15"
       },
       "dependencies": {
         "ansi-styles": {
@@ -7478,17 +7511,28 @@
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
             "supports-color": "4.5.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "4.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+              "dev": true,
+              "requires": {
+                "has-flag": "2.0.0"
+              }
+            }
           }
         },
         "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "version": "6.0.15",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
+          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
           "dev": true,
           "requires": {
             "chalk": "2.3.0",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.1.0"
           }
         },
         "source-map": {
@@ -7498,9 +7542,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
+          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -7515,7 +7559,7 @@
       "dev": true,
       "requires": {
         "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.14"
+        "postcss": "6.0.15"
       },
       "dependencies": {
         "ansi-styles": {
@@ -7536,17 +7580,28 @@
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
             "supports-color": "4.5.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "4.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+              "dev": true,
+              "requires": {
+                "has-flag": "2.0.0"
+              }
+            }
           }
         },
         "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "version": "6.0.15",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
+          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
           "dev": true,
           "requires": {
             "chalk": "2.3.0",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.1.0"
           }
         },
         "source-map": {
@@ -7556,9 +7611,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
+          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -7670,7 +7725,7 @@
         "mime": "1.6.0",
         "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
-        "postcss": "6.0.14",
+        "postcss": "6.0.15",
         "xxhashjs": "0.2.1"
       },
       "dependencies": {
@@ -7692,17 +7747,28 @@
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
             "supports-color": "4.5.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "4.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+              "dev": true,
+              "requires": {
+                "has-flag": "2.0.0"
+              }
+            }
           }
         },
         "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "version": "6.0.15",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
+          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
           "dev": true,
           "requires": {
             "chalk": "2.3.0",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.1.0"
           }
         },
         "source-map": {
@@ -7712,9 +7778,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
+          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -8399,7 +8465,7 @@
       "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.5.tgz",
       "integrity": "sha512-RxzILEgDOFvUgnuPVXNCfZ5f7Mv6RlQ1OyW925kmWRCgmV2V+g6G5qmKUmgW2HUQxp0YqqvRkqbez4Q/o6fRog==",
       "requires": {
-        "acorn": "5.2.1",
+        "acorn": "5.3.0",
         "estree-walker": "0.5.1",
         "magic-string": "0.22.4",
         "resolve": "1.5.0",
@@ -9437,7 +9503,7 @@
         "arrify": "1.0.1",
         "chalk": "2.3.0",
         "diff": "3.4.0",
-        "make-error": "1.3.0",
+        "make-error": "1.3.2",
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
         "source-map-support": "0.4.18",
@@ -9527,13 +9593,13 @@
         "resolve": "1.5.0",
         "semver": "5.4.1",
         "tslib": "1.8.1",
-        "tsutils": "2.14.0"
+        "tsutils": "2.15.0"
       }
     },
     "tsutils": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.14.0.tgz",
-      "integrity": "sha512-f6axSMV0RoUufiKiRQgmRlN1c+Ag+mDaZjcd6bHdvplT/zyhuMCGqw3pJS8s3+0x4EVkdoQajs9PchdDZlguvw==",
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.15.0.tgz",
+      "integrity": "sha512-kKb1mSqRMwF0GHKya5/hZsI2m7Flg4ONZDeYu4e6Gx+kYAu86zsLNCHcUmNWhCRaUcKshNI272hOzuaCQDzJ2g==",
       "dev": true,
       "requires": {
         "tslib": "1.8.1"
@@ -9613,9 +9679,9 @@
       "optional": true
     },
     "uglifyjs-webpack-plugin": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.4.tgz",
-      "integrity": "sha512-fRrOJ5tv6YCsJIhP9mPRnfgyo4DVNSIfNOa7Gs9aT1NNpeJc85W7GcbVxQgc+9rU3No6tnkbMqZ4xsgRBU+HGQ==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.5.tgz",
+      "integrity": "sha512-YBGc9G7dv12Vjx8vUQs54DZgAXVf04LlG6dNNiEbTZjL3PbUqiY4uPB9Kv+fUJaqRskEGva/lS7sh08yJr7jnA==",
       "dev": true,
       "requires": {
         "cacache": "10.0.1",
@@ -9972,7 +10038,7 @@
       "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==",
       "dev": true,
       "requires": {
-        "acorn": "5.2.1",
+        "acorn": "5.3.0",
         "acorn-dynamic-import": "2.0.2",
         "ajv": "5.5.2",
         "ajv-keywords": "2.1.1",
@@ -10658,9 +10724,9 @@
       "dev": true
     },
     "zone.js": {
-      "version": "0.8.18",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz",
-      "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q=="
+      "version": "0.8.19",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.19.tgz",
+      "integrity": "sha512-l9rofaOs6a4y1W8zt4pDmnCUCnYG377dG+5SZlXNWrTWYUuXFqcJZiOarhYiRVR0NI9sH/8ooPJiz4uprB/Mkg=="
     }
   }
 }
diff --git a/packages/demos/conference-app/angular/package.json b/packages/demos/conference-app/angular/package.json
index 3da9e3baa9..94eb85c7f1 100644
--- a/packages/demos/conference-app/angular/package.json
+++ b/packages/demos/conference-app/angular/package.json
@@ -12,15 +12,15 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^5.0.0",
-    "@angular/common": "^5.0.0",
-    "@angular/compiler": "^5.0.0",
-    "@angular/core": "^5.0.0",
-    "@angular/forms": "^5.0.0",
-    "@angular/http": "^5.0.0",
-    "@angular/platform-browser": "^5.0.0",
-    "@angular/platform-browser-dynamic": "^5.0.0",
-    "@angular/router": "^5.0.0",
+    "@angular/animations": "latest",
+    "@angular/common": "latest",
+    "@angular/compiler": "latest",
+    "@angular/core": "latest",
+    "@angular/forms": "latest",
+    "@angular/http": "latest",
+    "@angular/platform-browser": "latest",
+    "@angular/platform-browser-dynamic": "latest",
+    "@angular/router": "latest",
     "@ionic-native/core": "^4.3.1",
     "@ionic-native/in-app-browser": "^4.3.1",
     "@ionic-native/splash-screen": "^4.3.1",
@@ -28,15 +28,15 @@
     "@ionic/angular": "next",
     "@ionic/core": "next",
     "@ionic/storage": "2.1.3",
-    "@stencil/core": "^0.1.1-0",
+    "@stencil/core": "next",
     "core-js": "^2.4.1",
     "rxjs": "^5.5.2",
-    "zone.js": "^0.8.14"
+    "zone.js": "latest"
   },
   "devDependencies": {
-    "@angular/cli": "1.6.2",
-    "@angular/compiler-cli": "^5.0.0",
-    "@angular/language-service": "^5.0.0",
+    "@angular/cli": "latest",
+    "@angular/compiler-cli": "latest",
+    "@angular/language-service": "latest",
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
diff --git a/packages/demos/conference-app/angular/src/index.html b/packages/demos/conference-app/angular/src/index.html
index 4ae119d549..84501388a8 100644
--- a/packages/demos/conference-app/angular/src/index.html
+++ b/packages/demos/conference-app/angular/src/index.html
@@ -8,6 +8,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
   <script src="ionic/core/ionic.js"></script>
+  <script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDIF36CJZcALqWbWUJ9X8Vzfgfkia0VViE"></script>
 </head>
 <body>
   <app-root></app-root>
diff --git a/packages/demos/conference-app/angular/src/pages/about-popover/about-popover.ts b/packages/demos/conference-app/angular/src/pages/about-popover/about-popover.ts
index 94be471add..8c273bd7ba 100644
--- a/packages/demos/conference-app/angular/src/pages/about-popover/about-popover.ts
+++ b/packages/demos/conference-app/angular/src/pages/about-popover/about-popover.ts
@@ -7,11 +7,21 @@ import { App } from '@ionic/angular';
 @Component({
   template: `
     <ion-list>
-      <button ion-item (click)="close('http://ionicframework.com/docs/v2/getting-started')">Learn Ionic</button>
-      <button ion-item (click)="close('http://ionicframework.com/docs/v2')">Documentation</button>
-      <button ion-item (click)="close('http://showcase.ionicframework.com')">Showcase</button>
-      <button ion-item (click)="close('https://github.com/ionic-team/ionic')">GitHub Repo</button>
-      <button ion-item (click)="support()">Support</button>
+      <ion-item (click)="close('http://ionicframework.com/docs/v2/getting-started')">
+        <ion-label>Learn Ionic</ion-label>
+      </ion-item>
+      <ion-item (click)="close('http://ionicframework.com/docs/v2')">
+        <ion-label>Documentation</ion-label>
+      </ion-item>
+      <ion-item (click)="close('http://showcase.ionicframework.com')">
+        <ion-label>Showcase</ion-label>
+      </ion-item>
+      <ion-item (click)="close('https://github.com/ionic-team/ionic')">
+        <ion-label>GitHub Repo</ion-label>
+      </ion-item>
+      <ion-item (click)="support()">
+        <ion-label>Support</ion-label>
+      </ion-item>
     </ion-list>
   `
 })
diff --git a/packages/demos/conference-app/angular/src/pages/about/about.html b/packages/demos/conference-app/angular/src/pages/about/about.html
index cc292156d0..237a779f60 100644
--- a/packages/demos/conference-app/angular/src/pages/about/about.html
+++ b/packages/demos/conference-app/angular/src/pages/about/about.html
@@ -1,12 +1,13 @@
 <ion-header>
   <ion-toolbar>
-    <ion-button menuToggle>
+    <ion-button menuToggle> <!-- TODO menuToggle -->
       <ion-icon name="menu"></ion-icon>
     </ion-button>
     <ion-title>About</ion-title>
-    <ion-buttons end>
-      <ion-button icon-only (click)="presentPopover($event)">
-        <ion-icon name="more"></ion-icon>
+
+    <ion-buttons slot="end">
+      <ion-button slot="icon-only" (click)="presentPopover($event)">
+        <ion-icon name="more" style="width: 20px"></ion-icon> <!-- TODO remove temporary width style -->
       </ion-button>
     </ion-buttons>
   </ion-toolbar>
@@ -21,19 +22,19 @@
 
     <ion-list no-lines>
       <ion-item>
-        <ion-icon name="calendar" item-start></ion-icon>
+        <ion-icon name="calendar" slot="start"></ion-icon>
         <ion-label>Date</ion-label>
         <ion-datetime displayFormat="MMM DD, YYYY" max="2056" [(ngModel)]="conferenceDate"></ion-datetime>
       </ion-item>
 
       <ion-item>
-        <ion-icon name="pin" item-start></ion-icon>
+        <ion-icon name="pin" slot="start"></ion-icon>
         <ion-label>Location</ion-label>
         <ion-select>
-          <ion-option value="madison" selected>Madison, WI</ion-option>
-          <ion-option value="austin">Austin, TX</ion-option>
-          <ion-option value="chicago">Chicago, IL</ion-option>
-          <ion-option value="seattle">Seattle, WA</ion-option>
+          <ion-select-option value="madison" selected>Madison, WI</ion-select-option>
+          <ion-select-option value="austin">Austin, TX</ion-select-option>
+          <ion-select-option value="chicago">Chicago, IL</ion-select-option>
+          <ion-select-option value="seattle">Seattle, WA</ion-select-option>
         </ion-select>
       </ion-item>
     </ion-list>
diff --git a/packages/demos/conference-app/angular/src/pages/map/map.html b/packages/demos/conference-app/angular/src/pages/map/map.html
index 61030405a2..aa4f972a98 100644
--- a/packages/demos/conference-app/angular/src/pages/map/map.html
+++ b/packages/demos/conference-app/angular/src/pages/map/map.html
@@ -1,12 +1,12 @@
 <ion-header>
   <ion-toolbar>
-    <button ion-button menuToggle>
+    <ion-button menuToggle>
       <ion-icon name="menu"></ion-icon>
-    </button>
+    </ion-button>
     <ion-title>Map</ion-title>
   </ion-toolbar>
 </ion-header>
 
 <ion-content class="map-page">
-  <div style="height: 100%; width: 100%" #mapCanvas id="map_canvas"></div>
+  <div #mapCanvas class="map-canvas"></div>
 </ion-content>
diff --git a/packages/demos/conference-app/angular/src/pages/map/map.scss b/packages/demos/conference-app/angular/src/pages/map/map.scss
index ca5d2bb696..67947e7695 100644
--- a/packages/demos/conference-app/angular/src/pages/map/map.scss
+++ b/packages/demos/conference-app/angular/src/pages/map/map.scss
@@ -1,31 +1,17 @@
 
-page-map ion-content {
-  background: rgb(229, 227, 223);
+page-map .scroll-inner{
+  background: rgb(229, 227, 223);;
+  height: 100%;
+  width: 100%;
 }
 
-page-map {
-  #map_canvas {
-    height: 500px;
-    width: 320px;
-    background-color : transparent;
-  }
-}
-
-page-map ion-content {
-  background: rgb(229, 227, 223);
-}
-
-page-map #map_canvas {
+.map-canvas {
   width: 100%;
   height: 100%;
   opacity: 0;
-  transition: opacity 150ms ease-in
+  transition: opacity 150ms ease-in;
 }
 
-page-map #map_canvas.show-map {
+.show-map {
   opacity: 1;
 }
-
-ion-app._gmaps_cdv_ .nav-decor{
-  background-color: transparent !important;
-}
diff --git a/packages/demos/conference-app/angular/src/pages/map/map.ts b/packages/demos/conference-app/angular/src/pages/map/map.ts
index d3849e961e..7950f7d959 100644
--- a/packages/demos/conference-app/angular/src/pages/map/map.ts
+++ b/packages/demos/conference-app/angular/src/pages/map/map.ts
@@ -1,14 +1,14 @@
-import { Component, ViewChild, ElementRef } from '@angular/core';
+import { Component, ViewChild, ViewEncapsulation, ElementRef } from '@angular/core';
 
 import { ConferenceData } from '../../providers/conference-data';
 
 declare var google: any;
 
-
 @Component({
   selector: 'page-map',
   templateUrl: 'map.html',
-  styleUrls: ['./map.scss']
+  styleUrls: ['./map.scss'],
+  encapsulation: ViewEncapsulation.None
 })
 export class MapPage {
 
@@ -16,36 +16,53 @@ export class MapPage {
   constructor(public confData: ConferenceData) {
   }
 
-  ionViewDidLoad() {
-
+  ionViewDidEnter() {
       this.confData.getMap().subscribe((mapData: any) => {
         const mapEle = this.mapElement.nativeElement;
 
-        const map = new google.maps.Map(mapEle, {
-          center: mapData.find((d: any) => d.center),
-          zoom: 16
-        });
-
-        mapData.forEach((markerData: any) => {
-          const infoWindow = new google.maps.InfoWindow({
-            content: `<h5>${markerData.name}</h5>`
+        return this.getGoogle().then(() => {
+          const map = new google.maps.Map(mapEle, {
+            center: mapData.find((d: any) => d.center),
+            zoom: 16
           });
 
-          const marker = new google.maps.Marker({
-            position: markerData,
-            map: map,
-            title: markerData.name
+          mapData.forEach((markerData: any) => {
+            const infoWindow = new google.maps.InfoWindow({
+              content: `<h5>${markerData.name}</h5>`
+            });
+
+            const marker = new google.maps.Marker({
+              position: markerData,
+              map: map,
+              title: markerData.name
+            });
+
+            marker.addListener('click', () => {
+              infoWindow.open(map, marker);
+            });
           });
 
-          marker.addListener('click', () => {
-            infoWindow.open(map, marker);
+          google.maps.event.addListenerOnce(map, 'idle', () => {
+            mapEle.classList.add('show-map');
           });
         });
-
-        google.maps.event.addListenerOnce(map, 'idle', () => {
-          mapEle.classList.add('show-map');
-        });
-
       });
   }
+
+  getGoogle() {
+    function checkForGoogle(callback: Function) {
+      setTimeout(() => {
+        if (google) {
+          return callback(callback);
+        }
+
+        checkForGoogle(callback);
+
+      }, 50);
+    }
+
+    return new Promise((resolve) => {
+      checkForGoogle(resolve);
+    });
+  }
 }
diff --git a/packages/demos/conference-app/angular/src/pages/schedule-filter/schedule-filter.html b/packages/demos/conference-app/angular/src/pages/schedule-filter/schedule-filter.html
index 6eecfa1af8..94b5a87b13 100644
--- a/packages/demos/conference-app/angular/src/pages/schedule-filter/schedule-filter.html
+++ b/packages/demos/conference-app/angular/src/pages/schedule-filter/schedule-filter.html
@@ -1,15 +1,15 @@
 <ion-header>
   <ion-toolbar>
-    <ion-buttons start>
-      <button ion-button (click)="dismiss()">Cancel</button>
+    <ion-buttons slot="start">
+      <ion-button (click)="dismiss()">Cancel</ion-button>
     </ion-buttons>
 
     <ion-title>
       Filter Sessions
     </ion-title>
 
-    <ion-buttons end>
-      <button ion-button (click)="applyFilters()" strong>Done</button>
+    <ion-buttons slot="end">
+      <ion-button (click)="applyFilters()" strong>Done</ion-button>
     </ion-buttons>
   </ion-toolbar>
 </ion-header>
@@ -20,7 +20,7 @@
     <ion-list-header>Tracks</ion-list-header>
 
     <ion-item *ngFor="let track of tracks" [attr.track]="track.name | lowercase">
-      <span item-start class="dot"></span>
+      <span slot="start" class="dot"></span>
       <ion-label>{{track.name}}</ion-label>
       <ion-toggle [(ngModel)]="track.isChecked" color="secondary"></ion-toggle>
     </ion-item>
@@ -28,9 +28,9 @@
   </ion-list>
 
   <ion-list>
-    <button ion-item (click)="resetFilters()" detail-none class="reset-filters">
+    <ion-item (click)="resetFilters()" detail-none class="reset-filters">
       Reset All Filters
-    </button>
+    </ion-item>
   </ion-list>
 
 </ion-content>
diff --git a/packages/demos/conference-app/angular/src/pages/schedule/schedule.html b/packages/demos/conference-app/angular/src/pages/schedule/schedule.html
index f5539d1bb6..0ea6e132fd 100644
--- a/packages/demos/conference-app/angular/src/pages/schedule/schedule.html
+++ b/packages/demos/conference-app/angular/src/pages/schedule/schedule.html
@@ -13,8 +13,8 @@
       </ion-segment-button>
     </ion-segment>
 
-    <ion-buttons end>
-      <ion-button icon-only (click)="presentFilter()">
+    <ion-buttons slot="end">
+      <ion-button (click)="presentFilter()" slot="icon-only">
         <ion-icon ios="ios-options-outline" md="md-options"></ion-icon>
       </ion-button>
     </ion-buttons>
@@ -22,9 +22,9 @@
 
   <ion-toolbar no-border-top>
     <ion-searchbar color="primary"
-                   [(ngModel)]="queryText"
-                   (ionInput)="updateSchedule()"
-                   placeholder="Search">
+                    [(ngModel)]="queryText"
+                    (ionInput)="updateSchedule()"
+                    placeholder="Search">
     </ion-searchbar>
   </ion-toolbar>
 </ion-header>
@@ -46,22 +46,22 @@
 
       <ion-item-sliding *ngFor="let session of group.sessions" #slidingItem [attr.track]="session.tracks[0] | lowercase" [hidden]="session.hide">
 
-        <ion-item (click)="goToSessionDetail(session)">
+        <button ion-item (click)="goToSessionDetail(session)">
           <h3>{{session.name}}</h3>
           <p>
             {{session.timeStart}} &mdash;
             {{session.timeEnd}}:
             {{session.location}}
           </p>
-        </ion-item>
+        </button>
 
         <ion-item-options>
-          <ion-button color="favorite" (click)="addFavorite(slidingItem, session)" *ngIf="segment === 'all'">
+          <button ion-button color="favorite" (click)="addFavorite(slidingItem, session)" *ngIf="segment === 'all'">
             Favorite
-          </ion-button>
-          <ion-button color="danger" (click)="removeFavorite(slidingItem, session, 'Remove Favorite')" *ngIf="segment === 'favorites'">
+          </button>
+          <button ion-button color="danger" (click)="removeFavorite(slidingItem, session, 'Remove Favorite')" *ngIf="segment === 'favorites'">
             Remove
-          </ion-button>
+          </button>
         </ion-item-options>
 
       </ion-item-sliding>
@@ -75,13 +75,12 @@
   </ion-list-header>
 
   <ion-fab bottom right #fab>
-    <ion-fab><ion-icon name="share"></ion-icon></ion-fab>
+    <button ion-fab><ion-icon name="share"></ion-icon></button>
     <ion-fab-list side="top">
-      <ion-fab color="vimeo" (click)="openSocial('Vimeo', fab)"><ion-icon name="logo-vimeo"></ion-icon></ion-fab>
-      <ion-fab color="google" (click)="openSocial('Google+', fab)"><ion-icon name="logo-googleplus"></ion-icon></ion-fab>
-      <ion-fab ion-fab color="twitter" (click)="openSocial('Twitter', fab)"><ion-icon name="logo-twitter"></ion-icon></ion-fab>
-      <ion-fab ion-fab color="facebook" (click)="openSocial('Facebook', fab)"><ion-icon name="logo-facebook"></ion-icon></ion-fab>
+      <button ion-fab color="vimeo" (click)="openSocial('Vimeo', fab)"><ion-icon name="logo-vimeo"></ion-icon></button>
+      <button ion-fab color="google" (click)="openSocial('Google+', fab)"><ion-icon name="logo-googleplus"></ion-icon></button>
+      <button ion-fab color="twitter" (click)="openSocial('Twitter', fab)"><ion-icon name="logo-twitter"></ion-icon></button>
+      <button ion-fab color="facebook" (click)="openSocial('Facebook', fab)"><ion-icon name="logo-facebook"></ion-icon></button>
     </ion-fab-list>
   </ion-fab>
-
 </ion-content>
\ No newline at end of file
diff --git a/packages/demos/conference-app/angular/src/pages/schedule/schedule.ts b/packages/demos/conference-app/angular/src/pages/schedule/schedule.ts
index 2135b51acd..dec6ed90c2 100644
--- a/packages/demos/conference-app/angular/src/pages/schedule/schedule.ts
+++ b/packages/demos/conference-app/angular/src/pages/schedule/schedule.ts
@@ -54,7 +54,7 @@ export class SchedulePage {
     public user: UserData,
   ) {}
 
-  ionViewDidLoad() {
+  ionViewDidEnter() {
     this.app.setTitle('Schedule');
     this.updateSchedule();
   }
@@ -62,7 +62,7 @@ export class SchedulePage {
   updateSchedule() {
     // Close any open sliding items when the schedule updates
     if (this.scheduleList) {
-      this.scheduleList.closeSlidingItems();
+      // this.scheduleList.closeSlidingItems();
     }
 
     this.confData.getTimeline(this.dayIndex, this.queryText, this.excludeTracks, this.segment).subscribe((data: any) => {
diff --git a/packages/demos/conference-app/angular/src/pages/speaker-detail/speaker-detail.html b/packages/demos/conference-app/angular/src/pages/speaker-detail/speaker-detail.html
index 75c7e0f78c..774802ef3a 100644
--- a/packages/demos/conference-app/angular/src/pages/speaker-detail/speaker-detail.html
+++ b/packages/demos/conference-app/angular/src/pages/speaker-detail/speaker-detail.html
@@ -1,21 +1,21 @@
 <ion-header>
-  <ion-navbar>
+  <ion-toolbar>
     <ion-title>{{speaker?.name}}</ion-title>
-  </ion-navbar>
+  </ion-toolbar>
 </ion-header>
 
 <ion-content padding class="speaker-detail">
   <div text-center *ngIf="speaker">
     <img [src]="speaker.profilePic" [alt]="speaker.name"><br>
 
-    <ion-button icon-only clear small color="twitter">
-      <ion-icon name="logo-twitter"></ion-icon>
+    <ion-button clear small color="twitter">
+      <ion-icon name="logo-twitter" slot="icon-only"></ion-icon>
     </ion-button>
-    <ion-button ion-button icon-only clear small color="github">
-      <ion-icon name="logo-github"></ion-icon>
+    <ion-button clear small color="github">
+      <ion-icon name="logo-github" slot="icon-only"></ion-icon>
     </ion-button>
-    <ion-button ion-button icon-only clear small color="instagram">
-      <ion-icon name="logo-instagram"></ion-icon>
+    <ion-button clear small color="instagram">
+      <ion-icon name="logo-instagram" slot="icon-only"></ion-icon>
     </ion-button>
   </div>
 
diff --git a/packages/demos/conference-app/angular/src/pages/speaker-list/speaker-list.html b/packages/demos/conference-app/angular/src/pages/speaker-list/speaker-list.html
index 2ded0f9d0c..fab19eb2a7 100644
--- a/packages/demos/conference-app/angular/src/pages/speaker-list/speaker-list.html
+++ b/packages/demos/conference-app/angular/src/pages/speaker-list/speaker-list.html
@@ -16,42 +16,42 @@
 
           <ion-card class="speaker-card">
             <ion-card-header>
-              <ion-button ion-item detail-none (click)="goToSpeakerDetail(speaker)">
-                <ion-avatar item-start>
+              <ion-item detail-none (click)="goToSpeakerDetail(speaker)">
+                <ion-avatar slot="start">
                   <img [src]="speaker.profilePic" alt="Speaker profile pic">
                 </ion-avatar>
                 {{speaker.name}}
-              </ion-button>
+              </ion-item>
             </ion-card-header>
 
             <ion-card-content class="outer-content">
               <ion-list>
-                <ion-button ion-item *ngFor="let session of speaker.sessions" (click)="goToSessionDetail(session)">
+                <ion-item *ngFor="let session of speaker.sessions" (click)="goToSessionDetail(session)">
                   <h3>{{session.name}}</h3>
-                </ion-button>
+                </ion-item>
 
-                <ion-button ion-item (click)="goToSpeakerDetail(speaker)">
+                <ion-item (click)="goToSpeakerDetail(speaker)">
                   <h3>About {{speaker.name}}</h3>
-                </ion-button>
+                </ion-item>
               </ion-list>
             </ion-card-content>
 
             <ion-row no-padding>
               <ion-col col-12 col-lg-auto text-center text-lg-left>
-                <ion-button clear small color="primary" icon-start (click)="goToSpeakerTwitter(speaker)">
-                  <ion-icon name="logo-twitter"></ion-icon>
+                <ion-button clear small color="primary"(click)="goToSpeakerTwitter(speaker)">
+                  <ion-icon name="logo-twitter" slot="start"></ion-icon>
                   Tweet
                 </ion-button>
               </ion-col>
               <ion-col col-12 col-lg-auto text-center>
-                <ion-button clear small color="primary" icon-start (click)="openSpeakerShare(speaker)">
-                  <ion-icon name='share-alt'></ion-icon>
+                <ion-button clear small color="primary" (click)="openSpeakerShare(speaker)">
+                  <ion-icon name='share-alt' slit="start"></ion-icon>
                   Share
                 </ion-button>
               </ion-col>
               <ion-col col-12 col-lg-auto text-center text-lg-right>
-                <ion-button clear small color="primary" icon-start (click)="openContact(speaker)">
-                  <ion-icon name='chatboxes'></ion-icon>
+                <ion-button clear small color="primary" (click)="openContact(speaker)">
+                  <ion-icon name='chatboxes' slot="start"></ion-icon>
                   Contact
                 </ion-button>
               </ion-col>
diff --git a/packages/demos/conference-app/angular/src/pages/speaker-list/speaker-list.ts b/packages/demos/conference-app/angular/src/pages/speaker-list/speaker-list.ts
index 7082d54577..d6ba016c41 100644
--- a/packages/demos/conference-app/angular/src/pages/speaker-list/speaker-list.ts
+++ b/packages/demos/conference-app/angular/src/pages/speaker-list/speaker-list.ts
@@ -27,7 +27,7 @@ export class SpeakerListPage {
     public inAppBrowser: InAppBrowser
   ) {}
 
-  ionViewDidLoad() {
+  ionViewDidEnter() {
     this.confData.getSpeakers().subscribe((speakers: any[]) => {
       this.speakers = speakers;
     });