Merge branch 'master' into dev

Author: khoadnguyen

src/app/app.module.ts

@@ -15,8 +15,6 @@ import { TransitionPage } from '../pages/transition/transition';
 import { AssessmentPage } from '../pages/assessment/assessment';
 import { TimelinePage } from '../pages/timeline/timeline';
 
-import { ChartsModule } from 'ng2-charts';
-
 @NgModule({
   declarations: [
     MyApp,
@@ -32,8 +30,7 @@ import { ChartsModule } from 'ng2-charts';
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(MyApp),
-    ChartsModule
+    IonicModule.forRoot(MyApp)
   ],
   bootstrap: [IonicApp],
   entryComponents: [

src/index.html

@@ -17,7 +17,6 @@
 
   <!-- cordova.js required for cordova apps (remove if not needed) -->
   <script src="cordova.js"></script>
-  <script src="https://cdn.zingchart.com/zingchart.min.js"></script>
 
   <!-- un-comment this code to enable service worker
   <script>