Merge branch '2.0' into windows-mode

scripts/demos/webpack.config.js

@@ -31,9 +31,8 @@ module.exports = {
   },
   resolve: {
     alias: {
-      'ionic': path.normalize(process.cwd() + '/dist')
+      'ionic-angular': path.normalize(process.cwd() + '/dist')
     },
     extensions: ["", ".js", ".ts"]
   }
 };
-

scripts/docs/dgeni-config.js

@@ -113,7 +113,7 @@ module.exports = function(currentVersion){
 
   readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../..'));
   readTypeScriptModules.sourceFiles = [
-    'ionic/ionic.ts'
+    'ionic/index.ts'
   ];
 })