Merge branch 'master' into v5

README.md

@@ -56,10 +56,10 @@ export class MyComponent {
 
   constructor(private geolocation: Geolocation, private platform: Platform) {
 
-    platform.ready().then(() => {
+    this.platform.ready().then(() => {
 
       // get position
-      geolocation.getCurrentPosition().then(pos => {
+      this.geolocation.getCurrentPosition().then(pos => {
         console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
       });
 
@@ -67,7 +67,6 @@ export class MyComponent {
       // watch position
       const watch = geolocation.watchPosition().subscribe(pos => {
         console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
-        this.position = pos;
       });
 
       // to stop watching
@@ -169,7 +168,7 @@ providers: [
 Here's the full example:
 
 ```typescript
-import { NgModule, ErrorHandler } from '@angular/core';
+import { ErrorHandler, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
 import { MyApp } from './app.component';
@@ -177,26 +176,29 @@ import { HomePage } from '../pages/home/home';
 
 import { Camera } from '@ionic-native/camera/ngx';
 
+import { HomePage } from '../pages/home/home';
+import { MyApp } from './app.component';
+
 class CameraMock extends Camera {
   getPicture(options) {
     return new Promise((resolve, reject) => {
-      resolve("BASE_64_ENCODED_DATA_GOES_HERE");
-    })
+      resolve('BASE_64_ENCODED_DATA_GOES_HERE');
+    });
   }
 }
 
 @NgModule({
   declarations: [
-    MyApp,
+    MyApp, 
     HomePage
   ],
   imports: [
-    BrowserModule,
+    BrowserModule, 
     IonicModule.forRoot(MyApp)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    MyApp,
+    MyApp, 
     HomePage
   ],
   providers: [
@@ -205,6 +207,7 @@ class CameraMock extends Camera {
   ]
 })
 export class AppModule {}
+
 ```
 
 
@@ -223,6 +226,8 @@ Let us know or submit a PR! Take a look at [the Developer Guide](https://github.
 
 Ibby Hadeed - [@ihadeed](https://github.com/ihadeed)
 
+Daniel Sogl - [@sogldaniel](https://twitter.com/sogldaniel)
+
 Tim Lancina - [@timlancina](https://twitter.com/timlancina)
 
 Mike Hartington - [@mhartington](https://twitter.com/mhartington)