diff --git a/package-lock.json b/package-lock.json
index 89e0aaca5..c7cf02487 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,33 +5,41 @@
   "requires": true,
   "dependencies": {
     "@angular/compiler": {
-      "version": "5.2.9",
-      "resolved": "http://registry.npmjs.org/@angular/compiler/-/compiler-5.2.9.tgz",
-      "integrity": "sha512-mN+ofInk8y/tk2TCJZx8RrGdOKdrfunoCair7tfDy4XoQJE90waGfaYWo07hYU+UYwLhrg19m2Czy6rIDciUJA==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.4.tgz",
+      "integrity": "sha1-Mm6wAp2aNUGqyhJN75rcUcNvK0E=",
       "dev": true,
       "requires": {
-        "tslib": "1.9.0"
+        "tslib": "1.8.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "5.2.9",
-      "resolved": "http://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.9.tgz",
-      "integrity": "sha512-LAEpL/6PAev3zwTow/43Atzv9AtKLAiLoS285X3EV1f80yQpYAmFRrPUtDlrIZdhZHBBv7CxnyCVpOLU3T8ohw==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.4.tgz",
+      "integrity": "sha1-BjCApJfZF1OWglBQIixxfaGE9s8=",
       "dev": true,
       "requires": {
-        "chokidar": "1.7.0",
+        "@angular/tsc-wrapped": "4.4.4",
         "minimist": "1.2.0",
-        "reflect-metadata": "0.1.12",
-        "tsickle": "0.27.2"
+        "reflect-metadata": "0.1.10"
       }
     },
     "@angular/core": {
-      "version": "5.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.9.tgz",
-      "integrity": "sha512-cvHBJGtasrIoARvbLFyHaOsiWKVwMNrrSTZLwrlyHP8oYzkDrE0qKGer6QCqyKt+51hF53cgWEffGzM/u/0wYg==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.4.tgz",
+      "integrity": "sha1-vTfs9UFY+XSJmWyThr0iL4CjL1w=",
       "dev": true,
       "requires": {
-        "tslib": "1.9.0"
+        "tslib": "1.8.0"
+      }
+    },
+    "@angular/tsc-wrapped": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.4.tgz",
+      "integrity": "sha1-mEGCHlVha4JsoWAlD+heFfx0/8M=",
+      "dev": true,
+      "requires": {
+        "tsickle": "0.21.6"
       }
     },
     "@types/cordova": {
@@ -40,22 +48,16 @@
       "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=",
       "dev": true
     },
-    "@types/fancy-log": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-1.3.0.tgz",
-      "integrity": "sha512-mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw==",
-      "dev": true
-    },
     "@types/jasmine": {
-      "version": "2.8.6",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.6.tgz",
-      "integrity": "sha512-clg9raJTY0EOo5pVZKX3ZlMjlYzVU73L71q5OV1jhE2Uezb7oF94jh4CvwrW6wInquQAdhOxJz5VDF2TLUGmmA==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.3.tgz",
+      "integrity": "sha512-2dJf9//QxTnFBXHsCqLbB55jlMreJQie9HhgsZrSgHveOKCWVmgcXgRyvIi22Ndk/dJ/e2srLOstk2NgVbb7XA==",
       "dev": true
     },
     "@types/node": {
-      "version": "8.9.5",
-      "resolved": "http://registry.npmjs.org/@types/node/-/node-8.9.5.tgz",
-      "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==",
+      "version": "8.0.51",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.51.tgz",
+      "integrity": "sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==",
       "dev": true
     },
     "JSONStream": {
@@ -75,30 +77,13 @@
       "dev": true
     },
     "accepts": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
-      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
+      "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
       "dev": true,
       "requires": {
-        "mime-types": "2.1.18",
+        "mime-types": "2.1.17",
         "negotiator": "0.6.1"
-      },
-      "dependencies": {
-        "mime-db": {
-          "version": "1.33.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-          "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.18",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-          "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-          "dev": true,
-          "requires": {
-            "mime-db": "1.33.0"
-          }
-        }
       }
     },
     "acorn": {
@@ -107,61 +92,18 @@
       "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
       "dev": true
     },
-    "acorn-node": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz",
-      "integrity": "sha512-efP54n3d1aLfjL2UMdaXa6DsswwzJeI5rqhbFvXMrKiJ6eJFpf+7R0zN7t8IC+XKn2YOAFAv6xbBNgHUkoHWLw==",
-      "dev": true,
-      "requires": {
-        "acorn": "5.5.3",
-        "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "5.5.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
-          "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
-          "dev": true
-        }
-      }
-    },
     "add-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
       "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
       "dev": true
     },
-    "addressparser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
-      "integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y=",
-      "dev": true,
-      "optional": true
-    },
     "after": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
       "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
       "dev": true
     },
-    "agent-base": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
-      "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
-      "dev": true,
-      "requires": {
-        "extend": "3.0.1",
-        "semver": "5.0.3"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
-          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
-          "dev": true
-        }
-      }
-    },
     "ajv": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
@@ -191,85 +133,6 @@
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
-    "amqplib": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.5.2.tgz",
-      "integrity": "sha512-l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bitsyntax": "0.0.4",
-        "bluebird": "3.5.1",
-        "buffer-more-ints": "0.0.2",
-        "readable-stream": "1.1.14",
-        "safe-buffer": "5.1.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true,
-          "optional": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
-    "ansi-cyan": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
-    "ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
-    "ansi-red": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -282,12 +145,6 @@
       "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
       "dev": true
     },
-    "ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "dev": true
-    },
     "anymatch": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
@@ -305,9 +162,9 @@
       "dev": true
     },
     "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
       "dev": true,
       "requires": {
         "sprintf-js": "1.0.3"
@@ -328,12 +185,6 @@
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true
     },
-    "arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "dev": true
-    },
     "array-differ": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
@@ -346,12 +197,6 @@
       "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
       "dev": true
     },
-    "array-filter": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
-      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
-      "dev": true
-    },
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
@@ -364,18 +209,6 @@
       "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
       "dev": true
     },
-    "array-map": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
-      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=",
-      "dev": true
-    },
-    "array-reduce": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
-      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=",
-      "dev": true
-    },
     "array-slice": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz",
@@ -395,15 +228,9 @@
       "dev": true
     },
     "arraybuffer.slice": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
-      "dev": true
-    },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
+      "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=",
       "dev": true
     },
     "asap": {
@@ -419,9 +246,9 @@
       "dev": true
     },
     "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz",
+      "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -444,28 +271,6 @@
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "ast-types": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.3.tgz",
-      "integrity": "sha512-XA5o5dsNw8MhyW0Q7MWXJWc4oOzZKbdsEJq45h7c8q/d9DwWZ5F2ugUc1PuMLPGsUnphCt/cNDHu8JeBbxf1qA==",
-      "dev": true,
-      "optional": true
-    },
-    "astw": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz",
-      "integrity": "sha1-e9QXhNMkk5h66yOba04cV6hzuRc=",
-      "dev": true,
-      "requires": {
-        "acorn": "4.0.13"
-      }
-    },
     "async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -478,12 +283,6 @@
       "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
       "dev": true
     },
-    "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
-      "dev": true
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -502,16 +301,6 @@
       "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
       "dev": true
     },
-    "axios": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz",
-      "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "follow-redirects": "1.0.0"
-      }
-    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -530,7 +319,7 @@
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
-        "babel-generator": "6.26.1",
+        "babel-generator": "6.26.0",
         "babel-helpers": "6.24.1",
         "babel-messages": "6.23.0",
         "babel-register": "6.26.0",
@@ -539,10 +328,10 @@
         "babel-traverse": "6.26.0",
         "babel-types": "6.26.0",
         "babylon": "6.18.0",
-        "convert-source-map": "1.5.1",
+        "convert-source-map": "1.5.0",
         "debug": "2.6.9",
         "json5": "0.5.1",
-        "lodash": "4.17.5",
+        "lodash": "4.17.4",
         "minimatch": "3.0.4",
         "path-is-absolute": "1.0.1",
         "private": "0.1.8",
@@ -551,9 +340,9 @@
       }
     },
     "babel-generator": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
+      "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
       "dev": true,
       "requires": {
         "babel-messages": "6.23.0",
@@ -561,22 +350,11 @@
         "babel-types": "6.26.0",
         "detect-indent": "4.0.0",
         "jsesc": "1.3.0",
-        "lodash": "4.17.5",
+        "lodash": "4.17.4",
         "source-map": "0.5.7",
         "trim-right": "1.0.1"
       }
     },
-    "babel-helper-builder-binary-assignment-operator-visitor": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
-      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-      "dev": true,
-      "requires": {
-        "babel-helper-explode-assignable-expression": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
     "babel-helper-call-delegate": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
@@ -598,18 +376,7 @@
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
-        "lodash": "4.17.5"
-      }
-    },
-    "babel-helper-explode-assignable-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "lodash": "4.17.4"
       }
     },
     "babel-helper-function-name": {
@@ -663,20 +430,7 @@
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
-        "lodash": "4.17.5"
-      }
-    },
-    "babel-helper-remap-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "lodash": "4.17.4"
       }
     },
     "babel-helper-replace-supers": {
@@ -721,35 +475,6 @@
         "babel-runtime": "6.26.0"
       }
     },
-    "babel-plugin-syntax-async-functions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-      "dev": true
-    },
-    "babel-plugin-syntax-exponentiation-operator": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-      "dev": true
-    },
-    "babel-plugin-syntax-trailing-function-commas": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
-      "dev": true
-    },
-    "babel-plugin-transform-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
-      "dev": true,
-      "requires": {
-        "babel-helper-remap-async-to-generator": "6.24.1",
-        "babel-plugin-syntax-async-functions": "6.13.0",
-        "babel-runtime": "6.26.0"
-      }
-    },
     "babel-plugin-transform-es2015-arrow-functions": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
@@ -778,7 +503,7 @@
         "babel-template": "6.26.0",
         "babel-traverse": "6.26.0",
         "babel-types": "6.26.0",
-        "lodash": "4.17.5"
+        "lodash": "4.17.4"
       }
     },
     "babel-plugin-transform-es2015-classes": {
@@ -984,17 +709,6 @@
         "regexpu-core": "2.0.0"
       }
     },
-    "babel-plugin-transform-exponentiation-operator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
-      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-      "dev": true,
-      "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
-        "babel-runtime": "6.26.0"
-      }
-    },
     "babel-plugin-transform-regenerator": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
@@ -1014,15 +728,13 @@
         "babel-types": "6.26.0"
       }
     },
-    "babel-preset-env": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz",
-      "integrity": "sha512-W6VIyA6Ch9ePMI7VptNn2wBM6dbG0eSz25HEiL40nQXCsXGTGZSTZu1Iap+cj3Q0S5a7T9+529l/5Bkvd+afNA==",
+    "babel-preset-es2015": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
       "dev": true,
       "requires": {
         "babel-plugin-check-es2015-constants": "6.22.0",
-        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
-        "babel-plugin-transform-async-to-generator": "6.24.1",
         "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
         "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
         "babel-plugin-transform-es2015-block-scoping": "6.26.0",
@@ -1045,11 +757,7 @@
         "babel-plugin-transform-es2015-template-literals": "6.22.0",
         "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
         "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-        "babel-plugin-transform-exponentiation-operator": "6.24.1",
-        "babel-plugin-transform-regenerator": "6.26.0",
-        "browserslist": "2.11.3",
-        "invariant": "2.2.4",
-        "semver": "5.5.0"
+        "babel-plugin-transform-regenerator": "6.26.0"
       }
     },
     "babel-register": {
@@ -1062,7 +770,7 @@
         "babel-runtime": "6.26.0",
         "core-js": "2.5.1",
         "home-or-tmp": "2.0.0",
-        "lodash": "4.17.5",
+        "lodash": "4.17.4",
         "mkdirp": "0.5.1",
         "source-map-support": "0.4.18"
       }
@@ -1074,7 +782,7 @@
       "dev": true,
       "requires": {
         "core-js": "2.5.1",
-        "regenerator-runtime": "0.11.1"
+        "regenerator-runtime": "0.11.0"
       }
     },
     "babel-template": {
@@ -1087,7 +795,7 @@
         "babel-traverse": "6.26.0",
         "babel-types": "6.26.0",
         "babylon": "6.18.0",
-        "lodash": "4.17.5"
+        "lodash": "4.17.4"
       }
     },
     "babel-traverse": {
@@ -1103,8 +811,8 @@
         "babylon": "6.18.0",
         "debug": "2.6.9",
         "globals": "9.18.0",
-        "invariant": "2.2.4",
-        "lodash": "4.17.5"
+        "invariant": "2.2.2",
+        "lodash": "4.17.4"
       }
     },
     "babel-types": {
@@ -1115,7 +823,7 @@
       "requires": {
         "babel-runtime": "6.26.0",
         "esutils": "2.0.2",
-        "lodash": "4.17.5",
+        "lodash": "4.17.4",
         "to-fast-properties": "1.0.3"
       }
     },
@@ -1144,9 +852,9 @@
       "dev": true
     },
     "base64-js": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
-      "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
+      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
       "dev": true
     },
     "base64id": {
@@ -1192,50 +900,6 @@
       "integrity": "sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U=",
       "dev": true
     },
-    "bitsyntax": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.0.4.tgz",
-      "integrity": "sha1-6xDMb4K4xJDj6FaY8H6D1G4MuoI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "buffer-more-ints": "0.0.2"
-      }
-    },
-    "bl": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-      "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "readable-stream": "2.0.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "0.10.31",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "blob": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
@@ -1263,13 +927,13 @@
         "bytes": "3.0.0",
         "content-type": "1.0.4",
         "debug": "2.6.9",
-        "depd": "1.1.2",
+        "depd": "1.1.1",
         "http-errors": "1.6.2",
         "iconv-lite": "0.4.19",
         "on-finished": "2.3.0",
         "qs": "6.5.1",
         "raw-body": "2.3.2",
-        "type-is": "1.6.16"
+        "type-is": "1.6.15"
       }
     },
     "boom": {
@@ -1308,20 +972,6 @@
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
       "dev": true
     },
-    "browser-pack": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz",
-      "integrity": "sha512-Q4Rvn7P6ObyWfc4stqLWHtG1MJ8vVtjgT24Zbu+8UTzxYuZouqZsmNRRTFVMY/Ux0eIKv1d+JWzsInTX+fdHPQ==",
-      "dev": true,
-      "requires": {
-        "JSONStream": "1.3.1",
-        "combine-source-map": "0.8.0",
-        "defined": "1.0.0",
-        "safe-buffer": "5.1.1",
-        "through2": "2.0.3",
-        "umd": "3.0.3"
-      }
-    },
     "browser-resolve": {
       "version": "1.11.2",
       "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
@@ -1339,120 +989,6 @@
         }
       }
     },
-    "browserify": {
-      "version": "14.5.0",
-      "resolved": "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz",
-      "integrity": "sha512-gKfOsNQv/toWz+60nSPfYzuwSEdzvV2WdxrVPUbPD/qui44rAkB3t3muNtmmGYHqrG56FGwX9SUEQmzNLAeS7g==",
-      "dev": true,
-      "requires": {
-        "JSONStream": "1.3.1",
-        "assert": "1.4.1",
-        "browser-pack": "6.0.4",
-        "browser-resolve": "1.11.2",
-        "browserify-zlib": "0.2.0",
-        "buffer": "5.1.0",
-        "cached-path-relative": "1.0.1",
-        "concat-stream": "1.5.2",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.12.0",
-        "defined": "1.0.0",
-        "deps-sort": "2.0.0",
-        "domain-browser": "1.1.7",
-        "duplexer2": "0.1.4",
-        "events": "1.1.1",
-        "glob": "7.1.2",
-        "has": "1.0.1",
-        "htmlescape": "1.1.1",
-        "https-browserify": "1.0.0",
-        "inherits": "2.0.3",
-        "insert-module-globals": "7.0.2",
-        "labeled-stream-splicer": "2.0.0",
-        "module-deps": "4.1.1",
-        "os-browserify": "0.3.0",
-        "parents": "1.0.1",
-        "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "read-only-stream": "2.0.0",
-        "readable-stream": "2.3.3",
-        "resolve": "1.5.0",
-        "shasum": "1.0.2",
-        "shell-quote": "1.6.1",
-        "stream-browserify": "2.0.1",
-        "stream-http": "2.8.1",
-        "string_decoder": "1.0.3",
-        "subarg": "1.0.0",
-        "syntax-error": "1.4.0",
-        "through2": "2.0.3",
-        "timers-browserify": "1.4.2",
-        "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.10.3",
-        "vm-browserify": "0.0.4",
-        "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "concat-stream": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
-          "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3",
-            "readable-stream": "2.0.6",
-            "typedarray": "0.0.6"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.0.6",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-              "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-              "dev": true,
-              "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "1.0.7",
-                "string_decoder": "0.10.31",
-                "util-deprecate": "1.0.2"
-              }
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-              "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
-            }
-          }
-        },
-        "domain-browser": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
-          "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
-          "dev": true
-        },
-        "duplexer2": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-          "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "2.3.3"
-          }
-        },
-        "timers-browserify": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
-          "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
-          "dev": true,
-          "requires": {
-            "process": "0.11.10"
-          }
-        }
-      }
-    },
     "browserify-aes": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
@@ -1496,7 +1032,7 @@
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
-        "randombytes": "2.0.6"
+        "randombytes": "2.0.5"
       }
     },
     "browserify-sign": {
@@ -1523,54 +1059,22 @@
         "pako": "1.0.6"
       }
     },
-    "browserslist": {
-      "version": "2.11.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "1.0.30000815",
-        "electron-to-chromium": "1.3.39"
-      }
-    },
     "buffer": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz",
-      "integrity": "sha512-YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.0.8.tgz",
+      "integrity": "sha512-xXvjQhVNz50v2nPeoOsNqWCLGfiv4ji/gXZM28jnVwdLJxH4mFyqgqCKfaK9zf1KUbG6zTkjLOy7ou+jSMarGA==",
       "dev": true,
       "requires": {
-        "base64-js": "1.2.3",
+        "base64-js": "1.2.1",
         "ieee754": "1.1.8"
       }
     },
-    "buffer-more-ints": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz",
-      "integrity": "sha1-JrOIXRD6E9t/wBquOquHAZngEkw=",
-      "dev": true
-    },
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
       "dev": true
     },
-    "buildmail": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz",
-      "integrity": "sha1-h393OLeHKYccmhBeO4N9K+EaenI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "addressparser": "1.0.1",
-        "libbase64": "0.1.0",
-        "libmime": "3.0.0",
-        "libqp": "1.1.0",
-        "nodemailer-fetch": "1.6.0",
-        "nodemailer-shared": "1.1.0",
-        "punycode": "1.4.1"
-      }
-    },
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
@@ -1589,12 +1093,6 @@
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
       "dev": true
     },
-    "cached-path-relative": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
-      "integrity": "sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=",
-      "dev": true
-    },
     "callsite": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
@@ -1627,12 +1125,6 @@
         "map-obj": "1.0.1"
       }
     },
-    "caniuse-lite": {
-      "version": "1.0.30000815",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000815.tgz",
-      "integrity": "sha512-PGSOPK6gFe5fWd+eD0u2bG0aOsN1qC4B1E66tl3jOsIoKkTIcBYAc2+O6AeNzKW8RsFykWgnhkTlfOyuTzgI9A==",
-      "dev": true
-    },
     "canonical-path": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-0.0.2.tgz",
@@ -1723,7 +1215,6 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
-        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -1742,12 +1233,6 @@
         "safe-buffer": "5.1.1"
       }
     },
-    "circular-json": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.1.tgz",
-      "integrity": "sha512-UjgcRlTAhAkLeXmDe2wK7ktwy/tgAqxiSndTIPiFZuIPLZmzHzWMwUIe9h9m/OokypG7snxCDEuwJshGBdPvaw==",
-      "dev": true
-    },
     "cliui": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
@@ -1793,25 +1278,10 @@
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true
     },
-    "color-convert": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+    "coffee-script": {
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
+      "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
       "dev": true
     },
     "colors": {
@@ -1826,7 +1296,7 @@
       "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
       "dev": true,
       "requires": {
-        "lodash": "4.17.5"
+        "lodash": "4.17.4"
       }
     },
     "combine-source-map": {
@@ -1858,12 +1328,6 @@
         "delayed-stream": "1.0.0"
       }
     },
-    "commander": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz",
-      "integrity": "sha512-7B1ilBwtYSbetCgTY1NJFg+gVpestg0fdA1MhC1Vs4ssyfSXnCAjFr+QcQM9/RedXC0EaUx1sG8Smgw2VfgKEg==",
-      "dev": true
-    },
     "compare-func": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
@@ -1881,9 +1345,9 @@
       "dev": true
     },
     "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+      "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
       "dev": true
     },
     "component-inherit": {
@@ -1910,13 +1374,13 @@
       }
     },
     "connect": {
-      "version": "3.6.6",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-      "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
+      "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "finalhandler": "1.1.0",
+        "finalhandler": "1.0.6",
         "parseurl": "1.3.2",
         "utils-merge": "1.0.1"
       }
@@ -1953,316 +1417,110 @@
       "dev": true
     },
     "conventional-changelog": {
-      "version": "1.1.18",
-      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.18.tgz",
-      "integrity": "sha512-swf5bqhm7PsY2cw6zxuPy6+rZiiGwEpQnrWki+L+z2oZI53QSYwU4brpljmmWss821AsiwmVL+7V6hP+ER+TBA==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.7.tgz",
+      "integrity": "sha1-kVGmKx2O2y2CcR2r9bfPcQQfgrE=",
       "dev": true,
       "requires": {
-        "conventional-changelog-angular": "1.6.6",
-        "conventional-changelog-atom": "0.2.4",
-        "conventional-changelog-codemirror": "0.3.4",
-        "conventional-changelog-core": "2.0.5",
-        "conventional-changelog-ember": "0.3.6",
-        "conventional-changelog-eslint": "1.0.5",
-        "conventional-changelog-express": "0.3.4",
+        "conventional-changelog-angular": "1.5.2",
+        "conventional-changelog-atom": "0.1.2",
+        "conventional-changelog-codemirror": "0.2.1",
+        "conventional-changelog-core": "1.9.3",
+        "conventional-changelog-ember": "0.2.9",
+        "conventional-changelog-eslint": "0.2.1",
+        "conventional-changelog-express": "0.2.1",
         "conventional-changelog-jquery": "0.1.0",
         "conventional-changelog-jscs": "0.1.0",
-        "conventional-changelog-jshint": "0.3.4",
-        "conventional-changelog-preset-loader": "1.1.6"
+        "conventional-changelog-jshint": "0.2.1"
       }
     },
     "conventional-changelog-angular": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz",
-      "integrity": "sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.2.tgz",
+      "integrity": "sha1-Kzj2Zf6cWSCvGi+C9Uf0ur5t5Xw=",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
-        "q": "1.5.1"
-      },
-      "dependencies": {
-        "q": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-          "dev": true
-        }
+        "q": "1.5.0"
       }
     },
     "conventional-changelog-atom": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz",
-      "integrity": "sha512-4+hmbBwcAwx1XzDZ4aEOxk/ONU0iay10G0u/sld16ksgnRUHN7CxmZollm3FFaptr6VADMq1qxomA+JlpblBlg==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.2.tgz",
+      "integrity": "sha1-Ella1SZ6aTfDTPkAKBscZRmKTGM=",
       "dev": true,
       "requires": {
-        "q": "1.5.1"
-      },
-      "dependencies": {
-        "q": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-          "dev": true
-        }
+        "q": "1.5.0"
       }
     },
     "conventional-changelog-cli": {
-      "version": "1.3.16",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.16.tgz",
-      "integrity": "sha512-zNDG/rNbh29Z+d6zzrHN63dFZ4q9k1Ri0V8lXGw1q2ia6+FaE7AqJKccObbBFRmRISXpFESrqZiXpM4QeA84YA==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.4.tgz",
+      "integrity": "sha512-b8B1i01df+Lq5t16L3g8uoEGdzViChIKmIo7TComL4DqqrjrtasRaT+/4OPGcApEgX86JkBqb4KVt85ytQinUw==",
       "dev": true,
       "requires": {
         "add-stream": "1.0.0",
-        "conventional-changelog": "1.1.18",
-        "lodash": "4.17.5",
-        "meow": "4.0.0",
+        "conventional-changelog": "1.1.7",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
         "tempfile": "1.1.1"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "camelcase-keys": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
-          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
-          "dev": true,
-          "requires": {
-            "camelcase": "4.1.0",
-            "map-obj": "2.0.0",
-            "quick-lru": "1.1.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "indent-string": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
-          "dev": true
-        },
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "4.0.0",
-            "pify": "3.0.0",
-            "strip-bom": "3.0.0"
-          }
-        },
-        "map-obj": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-          "dev": true
-        },
-        "meow": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
-          "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
-          "dev": true,
-          "requires": {
-            "camelcase-keys": "4.2.0",
-            "decamelize-keys": "1.1.0",
-            "loud-rejection": "1.6.0",
-            "minimist": "1.2.0",
-            "minimist-options": "3.0.2",
-            "normalize-package-data": "2.4.0",
-            "read-pkg-up": "3.0.0",
-            "redent": "2.0.0",
-            "trim-newlines": "2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "1.3.1",
-            "json-parse-better-errors": "1.0.1"
-          }
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "4.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "3.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "3.0.0"
-          }
-        },
-        "redent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-          "dev": true,
-          "requires": {
-            "indent-string": "3.2.0",
-            "strip-indent": "2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "strip-indent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
-          "dev": true
-        },
-        "trim-newlines": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
-          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
-          "dev": true
-        }
       }
     },
     "conventional-changelog-codemirror": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz",
-      "integrity": "sha512-8M7pGgQVzRU//vG3rFlLYqqBywOLxu9XM0/lc1/1Ll7RuKA79PgK9TDpuPmQDHFnqGS7D1YiZpC3Z0D9AIYExg==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.1.tgz",
+      "integrity": "sha1-KZpPcUe681DmyBWPxUlUopHFzAk=",
       "dev": true,
       "requires": {
-        "q": "1.5.1"
-      },
-      "dependencies": {
-        "q": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-          "dev": true
-        }
+        "q": "1.5.0"
       }
     },
     "conventional-changelog-core": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz",
-      "integrity": "sha512-lP1s7Z3NyEFcG78bWy7GG7nXsq9OpAJgo2xbyAlVBDweLSL5ghvyEZlkEamnAQpIUVK0CAVhs8nPvCiQuXT/VA==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.3.tgz",
+      "integrity": "sha1-KJn+d5OJoynw7EsnRsNt3vuY2i0=",
       "dev": true,
       "requires": {
-        "conventional-changelog-writer": "3.0.4",
-        "conventional-commits-parser": "2.1.5",
-        "dateformat": "3.0.3",
+        "conventional-changelog-writer": "2.0.2",
+        "conventional-commits-parser": "2.0.1",
+        "dateformat": "1.0.12",
         "get-pkg-repo": "1.4.0",
-        "git-raw-commits": "1.3.4",
+        "git-raw-commits": "1.3.0",
         "git-remote-origin-url": "2.0.0",
-        "git-semver-tags": "1.3.4",
-        "lodash": "4.17.5",
+        "git-semver-tags": "1.2.3",
+        "lodash": "4.17.4",
         "normalize-package-data": "2.4.0",
-        "q": "1.5.1",
+        "q": "1.5.0",
         "read-pkg": "1.1.0",
         "read-pkg-up": "1.0.1",
         "through2": "2.0.3"
-      },
-      "dependencies": {
-        "dateformat": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-          "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-          "dev": true
-        },
-        "q": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-          "dev": true
-        }
       }
     },
     "conventional-changelog-ember": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz",
-      "integrity": "sha512-hBM1xb5IrjNtsjXaGryPF/Wn36cwyjkNeqX/CIDbJv/1kRFBHsWoSPYBiNVEpg8xE5fcK4DbPhGTDN2sVoPeiA==",
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.9.tgz",
+      "integrity": "sha1-jsc8wFTjqwZGZ/sf61L+jvGxZDg=",
       "dev": true,
       "requires": {
-        "q": "1.5.1"
-      },
-      "dependencies": {
-        "q": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-          "dev": true
-        }
+        "q": "1.5.0"
       }
     },
     "conventional-changelog-eslint": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.5.tgz",
-      "integrity": "sha512-7NUv+gMOS8Y49uPFRgF7kuLZqpnrKa2bQMZZsc62NzvaJmjUktnV03PYHuXhTDEHt5guvV9gyEFtUpgHCDkojg==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.1.tgz",
+      "integrity": "sha1-LCoRvrIW+AZJunKDQYApO2h8BmI=",
       "dev": true,
       "requires": {
-        "q": "1.5.1"
-      },
-      "dependencies": {
-        "q": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-          "dev": true
-        }
+        "q": "1.5.0"
       }
     },
     "conventional-changelog-express": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz",
-      "integrity": "sha512-M+UUb715TXT6l9vyMf4HYvAepnQn0AYTcPi6KHrFsd80E0HErjQnqStBg8i3+Qm7EV9+RyATQEnIhSzHbdQ7+A==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.1.tgz",
+      "integrity": "sha1-g42eHmyQmXA7FQucGaoteBdCvWw=",
       "dev": true,
       "requires": {
-        "q": "1.5.1"
-      },
-      "dependencies": {
-        "q": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-          "dev": true
-        }
+        "q": "1.5.0"
       }
     },
     "conventional-changelog-jquery": {
@@ -2271,7 +1529,7 @@
       "integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=",
       "dev": true,
       "requires": {
-        "q": "1.5.1"
+        "q": "1.5.0"
       }
     },
     "conventional-changelog-jscs": {
@@ -2280,204 +1538,35 @@
       "integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=",
       "dev": true,
       "requires": {
-        "q": "1.5.1"
+        "q": "1.5.0"
       }
     },
     "conventional-changelog-jshint": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz",
-      "integrity": "sha512-CdrqwDgL56b176FVxHmhuOvnO1dRDQvrMaHyuIVjcFlOXukATz2wVT17g8jQU3LvybVbyXvJRbdD5pboo7/1KQ==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.1.tgz",
+      "integrity": "sha1-hhObs6yZiZ8rF36WF+CbN9mbzzo=",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
-        "q": "1.5.1"
-      },
-      "dependencies": {
-        "q": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-          "dev": true
-        }
+        "q": "1.5.0"
       }
     },
-    "conventional-changelog-preset-loader": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz",
-      "integrity": "sha512-yWPIP9wwsCKeUSPYApnApWhKIDjWRIX/uHejGS1tYfEsQR/bwpDFET7LYiHT+ujNbrlf6h1s3NlPGheOd4yJRQ==",
-      "dev": true
-    },
     "conventional-changelog-writer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz",
-      "integrity": "sha512-EUf/hWiEj3IOa5Jk8XDzM6oS0WgijlYGkUfLc+mDnLH9RwpZqhYIBwgJHWHzEB4My013wx2FhmUu45P6tQrucw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.2.tgz",
+      "integrity": "sha1-tYV97RsAHa+aeLnNQJJvRcE0lJs=",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
-        "conventional-commits-filter": "1.1.5",
-        "dateformat": "3.0.3",
+        "conventional-commits-filter": "1.1.0",
+        "dateformat": "1.0.12",
         "handlebars": "4.0.11",
         "json-stringify-safe": "5.0.1",
-        "lodash": "4.17.5",
-        "meow": "4.0.0",
-        "semver": "5.5.0",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
+        "semver": "5.3.0",
         "split": "1.0.1",
         "through2": "2.0.3"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "camelcase-keys": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
-          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
-          "dev": true,
-          "requires": {
-            "camelcase": "4.1.0",
-            "map-obj": "2.0.0",
-            "quick-lru": "1.1.0"
-          }
-        },
-        "dateformat": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-          "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "indent-string": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
-          "dev": true
-        },
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "4.0.0",
-            "pify": "3.0.0",
-            "strip-bom": "3.0.0"
-          }
-        },
-        "map-obj": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-          "dev": true
-        },
-        "meow": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
-          "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
-          "dev": true,
-          "requires": {
-            "camelcase-keys": "4.2.0",
-            "decamelize-keys": "1.1.0",
-            "loud-rejection": "1.6.0",
-            "minimist": "1.2.0",
-            "minimist-options": "3.0.2",
-            "normalize-package-data": "2.4.0",
-            "read-pkg-up": "3.0.0",
-            "redent": "2.0.0",
-            "trim-newlines": "2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "1.3.1",
-            "json-parse-better-errors": "1.0.1"
-          }
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "4.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "3.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "3.0.0"
-          }
-        },
-        "redent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-          "dev": true,
-          "requires": {
-            "indent-string": "3.2.0",
-            "strip-indent": "2.0.0"
-          }
-        },
-        "semver": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "strip-indent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
-          "dev": true
-        },
-        "trim-newlines": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
-          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
-          "dev": true
-        }
       }
     },
     "conventional-commit-types": {
@@ -2487,9 +1576,9 @@
       "dev": true
     },
     "conventional-commits-filter": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz",
-      "integrity": "sha512-mj3+WLj8UZE72zO9jocZjx8+W4Bwnx/KHoIz1vb4F8XUXj0XSjp8Y3MFkpRyIpsRiCBX+DkDjxGKF/nfeu7BGw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.0.tgz",
+      "integrity": "sha1-H8Ka8wte2rdvVOIpxBGwxmPQ+es=",
       "dev": true,
       "requires": {
         "is-subset": "0.1.1",
@@ -2497,167 +1586,24 @@
       }
     },
     "conventional-commits-parser": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz",
-      "integrity": "sha512-jaAP61py+ISMF3/n3yIiIuY5h6mJlucOqawu5mLB1HaQADLvg/y5UB3pT7HSucZJan34lp7+7ylQPfbKEGmxrA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.1.tgz",
+      "integrity": "sha1-HxXOa4RPfKQUlcgZDAgzwwuLFpM=",
       "dev": true,
       "requires": {
         "JSONStream": "1.3.1",
         "is-text-path": "1.0.1",
-        "lodash": "4.17.5",
-        "meow": "4.0.0",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
         "split2": "2.2.0",
         "through2": "2.0.3",
         "trim-off-newlines": "1.0.1"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "camelcase-keys": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
-          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
-          "dev": true,
-          "requires": {
-            "camelcase": "4.1.0",
-            "map-obj": "2.0.0",
-            "quick-lru": "1.1.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "indent-string": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
-          "dev": true
-        },
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "4.0.0",
-            "pify": "3.0.0",
-            "strip-bom": "3.0.0"
-          }
-        },
-        "map-obj": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-          "dev": true
-        },
-        "meow": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
-          "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
-          "dev": true,
-          "requires": {
-            "camelcase-keys": "4.2.0",
-            "decamelize-keys": "1.1.0",
-            "loud-rejection": "1.6.0",
-            "minimist": "1.2.0",
-            "minimist-options": "3.0.2",
-            "normalize-package-data": "2.4.0",
-            "read-pkg-up": "3.0.0",
-            "redent": "2.0.0",
-            "trim-newlines": "2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "1.3.1",
-            "json-parse-better-errors": "1.0.1"
-          }
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "4.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "3.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "3.0.0"
-          }
-        },
-        "redent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-          "dev": true,
-          "requires": {
-            "indent-string": "3.2.0",
-            "strip-indent": "2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "strip-indent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
-          "dev": true
-        },
-        "trim-newlines": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
-          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
-          "dev": true
-        }
       }
     },
     "convert-source-map": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
-      "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
+      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
       "dev": true
     },
     "cookie": {
@@ -2679,15 +1625,15 @@
       "dev": true
     },
     "cpr": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz",
-      "integrity": "sha1-uaVQOLfNgaNcF7l2GJW9hJau8eU=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cpr/-/cpr-2.0.0.tgz",
+      "integrity": "sha1-wqRHyVFsN+u2R8qiYWvu+i7mcBE=",
       "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
-        "rimraf": "2.6.2"
+        "rimraf": "2.6.1"
       }
     },
     "create-ecdh": {
@@ -2709,7 +1655,7 @@
         "cipher-base": "1.0.4",
         "inherits": "2.0.3",
         "ripemd160": "2.0.1",
-        "sha.js": "2.4.10"
+        "sha.js": "2.4.9"
       }
     },
     "create-hmac": {
@@ -2723,7 +1669,7 @@
         "inherits": "2.0.3",
         "ripemd160": "2.0.1",
         "safe-buffer": "5.1.1",
-        "sha.js": "2.4.10"
+        "sha.js": "2.4.9"
       }
     },
     "cross-spawn": {
@@ -2771,8 +1717,8 @@
         "inherits": "2.0.3",
         "pbkdf2": "3.0.14",
         "public-encrypt": "4.0.0",
-        "randombytes": "2.0.6",
-        "randomfill": "1.0.4"
+        "randombytes": "2.0.5",
+        "randomfill": "1.0.3"
       }
     },
     "currently-unhandled": {
@@ -2797,14 +1743,15 @@
       "dev": true
     },
     "cz-conventional-changelog": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-2.1.0.tgz",
-      "integrity": "sha1-L0vHOQ4yROTfKT5ro1Hkx0Cnx2Q=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-2.0.0.tgz",
+      "integrity": "sha1-Val5r9/pXnAkh50qD1kkYwFwtTM=",
       "dev": true,
       "requires": {
         "conventional-commit-types": "2.2.0",
         "lodash.map": "4.6.0",
         "longest": "1.0.1",
+        "pad-right": "0.2.2",
         "right-pad": "1.0.1",
         "word-wrap": "1.2.3"
       }
@@ -2827,13 +1774,6 @@
         "assert-plus": "1.0.0"
       }
     },
-    "data-uri-to-buffer": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
-      "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==",
-      "dev": true,
-      "optional": true
-    },
     "date-format": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-0.0.0.tgz",
@@ -2866,39 +1806,10 @@
       }
     },
     "decamelize": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-      "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-      "dev": true,
-      "requires": {
-        "xregexp": "4.0.0"
-      },
-      "dependencies": {
-        "xregexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
-          "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
-          "dev": true
-        }
-      }
-    },
-    "decamelize-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-      "dev": true,
-      "requires": {
-        "decamelize": "1.2.0",
-        "map-obj": "1.0.1"
-      },
-      "dependencies": {
-        "decamelize": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-          "dev": true
-        }
-      }
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -2915,33 +1826,6 @@
         "clone": "1.0.3"
       }
     },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-      "dev": true
-    },
-    "degenerator": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
-      "integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "ast-types": "0.11.3",
-        "escodegen": "1.8.1",
-        "esprima": "3.1.3"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -2949,9 +1833,9 @@
       "dev": true
     },
     "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
       "dev": true
     },
     "dependency-graph": {
@@ -2966,18 +1850,6 @@
       "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
       "dev": true
     },
-    "deps-sort": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
-      "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=",
-      "dev": true,
-      "requires": {
-        "JSONStream": "1.3.1",
-        "shasum": "1.0.2",
-        "subarg": "1.0.0",
-        "through2": "2.0.3"
-      }
-    },
     "des.js": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
@@ -3006,28 +1878,10 @@
         "repeating": "2.0.1"
       }
     },
-    "detective": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
-      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
-      "dev": true,
-      "requires": {
-        "acorn": "5.5.3",
-        "defined": "1.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "5.5.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
-          "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
-          "dev": true
-        }
-      }
-    },
     "dgeni": {
-      "version": "0.4.9",
-      "resolved": "https://registry.npmjs.org/dgeni/-/dgeni-0.4.9.tgz",
-      "integrity": "sha1-nkJ3WxOGyl64JHU6ws0WnY9hztE=",
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/dgeni/-/dgeni-0.4.7.tgz",
+      "integrity": "sha1-UHBifdKPiNSABuIfVa+xipy4vmg=",
       "dev": true,
       "requires": {
         "canonical-path": "0.0.2",
@@ -3038,7 +1892,7 @@
         "optimist": "0.6.1",
         "q": "1.4.1",
         "validate.js": "0.9.0",
-        "winston": "2.4.1"
+        "winston": "2.4.0"
       },
       "dependencies": {
         "lodash": {
@@ -3064,19 +1918,19 @@
         "canonical-path": "0.0.2",
         "catharsis": "0.8.9",
         "change-case": "3.0.0",
-        "dgeni": "0.4.9",
+        "dgeni": "0.4.7",
         "espree": "2.2.5",
         "estraverse": "4.2.0",
         "glob": "7.1.2",
         "htmlparser2": "3.9.2",
-        "lodash": "4.17.5",
+        "lodash": "4.17.4",
         "marked": "0.3.6",
         "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
         "mkdirp-promise": "5.0.1",
         "node-html-encoder": "0.0.2",
         "nunjucks": "2.5.2",
-        "semver": "5.5.0",
+        "semver": "5.3.0",
         "shelljs": "0.7.8",
         "spdx-license-list": "2.1.0",
         "stringmap": "0.2.2",
@@ -3098,9 +1952,9 @@
       "dev": true
     },
     "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
+      "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==",
       "dev": true
     },
     "diffie-hellman": {
@@ -3111,7 +1965,7 @@
       "requires": {
         "bn.js": "4.11.8",
         "miller-rabin": "4.0.1",
-        "randombytes": "2.0.6"
+        "randombytes": "2.0.5"
       }
     },
     "doctrine": {
@@ -3169,9 +2023,9 @@
       }
     },
     "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
+      "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
       "dev": true
     },
     "domelementtype": {
@@ -3217,13 +2071,6 @@
         "is-obj": "1.0.1"
       }
     },
-    "double-ended-queue": {
-      "version": "2.1.0-0",
-      "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
-      "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=",
-      "dev": true,
-      "optional": true
-    },
     "duplexer2": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
@@ -3275,12 +2122,6 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
       "dev": true
     },
-    "electron-to-chromium": {
-      "version": "1.3.39",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.39.tgz",
-      "integrity": "sha1-16RpZAnKCZXidQFW2mEsIhr62E0=",
-      "dev": true
-    },
     "elliptic": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
@@ -3297,9 +2138,9 @@
       }
     },
     "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
+      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=",
       "dev": true
     },
     "end-of-stream": {
@@ -3323,72 +2164,91 @@
       }
     },
     "engine.io": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz",
-      "integrity": "sha512-D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
+      "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.5",
+        "accepts": "1.3.3",
         "base64id": "1.0.0",
         "cookie": "0.3.1",
-        "debug": "3.1.0",
-        "engine.io-parser": "2.1.2",
-        "uws": "9.14.0",
-        "ws": "3.3.3"
+        "debug": "2.3.3",
+        "engine.io-parser": "1.3.2",
+        "ws": "1.1.2"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "0.7.2"
           }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
         }
       }
     },
     "engine.io-client": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz",
-      "integrity": "sha512-hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz",
+      "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=",
       "dev": true,
       "requires": {
         "component-emitter": "1.2.1",
         "component-inherit": "0.0.3",
-        "debug": "3.1.0",
-        "engine.io-parser": "2.1.2",
+        "debug": "2.3.3",
+        "engine.io-parser": "1.3.2",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
+        "parsejson": "0.0.3",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "ws": "3.3.3",
-        "xmlhttprequest-ssl": "1.5.5",
+        "ws": "1.1.2",
+        "xmlhttprequest-ssl": "1.5.3",
         "yeast": "0.1.2"
       },
       "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "0.7.2"
           }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
         }
       }
     },
     "engine.io-parser": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz",
-      "integrity": "sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
+      "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
       "dev": true,
       "requires": {
         "after": "0.8.2",
-        "arraybuffer.slice": "0.0.7",
+        "arraybuffer.slice": "0.0.6",
         "base64-arraybuffer": "0.1.5",
         "blob": "0.0.4",
-        "has-binary2": "1.0.2"
+        "has-binary": "0.1.7",
+        "wtf-8": "1.0.0"
       }
     },
     "ent": {
@@ -3590,23 +2450,6 @@
       "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
       "dev": true
     },
-    "extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dev": true,
-      "requires": {
-        "kind-of": "1.1.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-          "dev": true
-        }
-      }
-    },
     "extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
@@ -3694,13 +2537,6 @@
         "pend": "1.2.0"
       }
     },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -3721,13 +2557,13 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
+      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "1.0.2",
+        "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "on-finished": "2.3.0",
         "parseurl": "1.3.2",
@@ -3807,16 +2643,6 @@
       "integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=",
       "dev": true
     },
-    "follow-redirects": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
-      "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "debug": "2.6.9"
-      }
-    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -3856,23 +2682,36 @@
       "dev": true
     },
     "fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz",
+      "integrity": "sha1-M3NSve1KC3FPPrhN6M6nZenTdgA=",
       "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
-        "jsonfile": "4.0.0",
-        "universalify": "0.1.1"
+        "jsonfile": "2.4.0"
+      }
+    },
+    "fs-extra-promise": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/fs-extra-promise/-/fs-extra-promise-0.4.1.tgz",
+      "integrity": "sha1-rCjNLPa6ckjYI13ziHts9u3fNC8=",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "fs-extra": "0.30.0"
       },
       "dependencies": {
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+        "fs-extra": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "klaw": "1.3.1",
+            "path-is-absolute": "1.0.1",
+            "rimraf": "2.6.1"
           }
         }
       }
@@ -3883,956 +2722,6 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "fsevents": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
-      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "2.10.0",
-        "node-pre-gyp": "0.6.39"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
-          }
-        },
-        "asn1": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "balanced-match": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "tweetnacl": "0.14.5"
-          }
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        },
-        "boom": {
-          "version": "2.10.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.7",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "balanced-match": "0.4.2",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "co": {
-          "version": "4.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "combined-stream": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "delayed-stream": "1.0.0"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "boom": "2.10.1"
-          }
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "extend": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "extsprintf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
-          }
-        },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
-          }
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "1.1.1",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": true,
-          "dev": true
-        },
-        "har-schema": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "har-validator": {
-          "version": "4.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "bundled": true,
-          "dev": true
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "ini": {
-          "version": "1.3.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-stable-stringify": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsonify": "0.0.0"
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsprim": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.0.2",
-            "json-schema": "0.2.3",
-            "verror": "1.3.6"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.27.0",
-          "bundled": true,
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.15",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "mime-db": "1.27.0"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "node-pre-gyp": {
-          "version": "0.6.39",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "1.0.2",
-            "hawk": "3.1.3",
-            "mkdirp": "0.5.1",
-            "nopt": "4.0.1",
-            "npmlog": "4.1.0",
-            "rc": "1.2.1",
-            "request": "2.81.0",
-            "rimraf": "2.6.1",
-            "semver": "5.3.0",
-            "tar": "2.2.1",
-            "tar-pack": "3.4.0"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "bundled": true,
-          "dev": true
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "qs": {
-          "version": "6.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.2.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "buffer-shims": "1.0.0",
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "1.0.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "request": {
-          "version": "2.81.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "4.2.1",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.15",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.0.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "sshpk": {
-          "version": "1.13.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asn1": "0.2.3",
-            "assert-plus": "1.0.0",
-            "bcrypt-pbkdf": "1.0.1",
-            "dashdash": "1.14.1",
-            "ecc-jsbn": "0.1.1",
-            "getpass": "0.1.7",
-            "jodid25519": "1.0.2",
-            "jsbn": "0.1.1",
-            "tweetnacl": "0.14.5"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "2.2.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "block-stream": "0.0.9",
-            "fstream": "1.0.11",
-            "inherits": "2.0.3"
-          }
-        },
-        "tar-pack": {
-          "version": "3.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "2.6.8",
-            "fstream": "1.0.11",
-            "fstream-ignore": "1.0.5",
-            "once": "1.4.0",
-            "readable-stream": "2.2.9",
-            "rimraf": "2.6.1",
-            "tar": "2.2.1",
-            "uid-number": "0.0.6"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.3.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "punycode": "1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "verror": {
-          "version": "1.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extsprintf": "1.0.2"
-          }
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        }
-      }
-    },
-    "ftp": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "readable-stream": "1.1.14",
-        "xregexp": "2.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true,
-          "optional": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
     "gaze": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
@@ -4842,23 +2731,6 @@
         "globule": "0.1.0"
       }
     },
-    "generate-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-      "dev": true,
-      "optional": true
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "is-property": "1.0.2"
-      }
-    },
     "get-pkg-repo": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz",
@@ -4878,21 +2750,6 @@
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
       "dev": true
     },
-    "get-uri": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.1.tgz",
-      "integrity": "sha512-7aelVrYqCLuVjq2kEKRTH8fXPTC0xKTkM+G7UlFkEwCXY3sFbSxvY375JoFowOAYbkaU47SrBvOefUlLZZ+6QA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "data-uri-to-buffer": "1.2.0",
-        "debug": "2.6.9",
-        "extend": "3.0.1",
-        "file-uri-to-path": "1.0.0",
-        "ftp": "0.3.10",
-        "readable-stream": "2.3.3"
-      }
-    },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -4903,159 +2760,16 @@
       }
     },
     "git-raw-commits": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.4.tgz",
-      "integrity": "sha512-G3O+41xHbscpgL5nA0DUkbFVgaAz5rd57AMSIMew8p7C8SyFwZDyn08MoXHkTl9zcD0LmxsLFPxbqFY4YPbpPA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.0.tgz",
+      "integrity": "sha1-C8hZbpDV/+c29/VUa9LRL3OrqsY=",
       "dev": true,
       "requires": {
         "dargs": "4.1.0",
         "lodash.template": "4.4.0",
-        "meow": "4.0.0",
+        "meow": "3.7.0",
         "split2": "2.2.0",
         "through2": "2.0.3"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "camelcase-keys": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
-          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
-          "dev": true,
-          "requires": {
-            "camelcase": "4.1.0",
-            "map-obj": "2.0.0",
-            "quick-lru": "1.1.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "indent-string": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
-          "dev": true
-        },
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "4.0.0",
-            "pify": "3.0.0",
-            "strip-bom": "3.0.0"
-          }
-        },
-        "map-obj": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-          "dev": true
-        },
-        "meow": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
-          "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
-          "dev": true,
-          "requires": {
-            "camelcase-keys": "4.2.0",
-            "decamelize-keys": "1.1.0",
-            "loud-rejection": "1.6.0",
-            "minimist": "1.2.0",
-            "minimist-options": "3.0.2",
-            "normalize-package-data": "2.4.0",
-            "read-pkg-up": "3.0.0",
-            "redent": "2.0.0",
-            "trim-newlines": "2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "1.3.1",
-            "json-parse-better-errors": "1.0.1"
-          }
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "4.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "3.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "3.0.0"
-          }
-        },
-        "redent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-          "dev": true,
-          "requires": {
-            "indent-string": "3.2.0",
-            "strip-indent": "2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "strip-indent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
-          "dev": true
-        },
-        "trim-newlines": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
-          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
-          "dev": true
-        }
       }
     },
     "git-remote-origin-url": {
@@ -5069,162 +2783,13 @@
       }
     },
     "git-semver-tags": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.4.tgz",
-      "integrity": "sha512-Xe2Z74MwXZfAezuaO6e6cA4nsgeCiARPzaBp23gma325c/OXdt//PhrknptIaynNeUp2yWtmikV7k5RIicgGIQ==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.3.tgz",
+      "integrity": "sha1-GItFOIK/nXojr9Mbq6U32rc4jV0=",
       "dev": true,
       "requires": {
-        "meow": "4.0.0",
-        "semver": "5.5.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "camelcase-keys": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
-          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
-          "dev": true,
-          "requires": {
-            "camelcase": "4.1.0",
-            "map-obj": "2.0.0",
-            "quick-lru": "1.1.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "indent-string": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
-          "dev": true
-        },
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "4.0.0",
-            "pify": "3.0.0",
-            "strip-bom": "3.0.0"
-          }
-        },
-        "map-obj": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-          "dev": true
-        },
-        "meow": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
-          "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
-          "dev": true,
-          "requires": {
-            "camelcase-keys": "4.2.0",
-            "decamelize-keys": "1.1.0",
-            "loud-rejection": "1.6.0",
-            "minimist": "1.2.0",
-            "minimist-options": "3.0.2",
-            "normalize-package-data": "2.4.0",
-            "read-pkg-up": "3.0.0",
-            "redent": "2.0.0",
-            "trim-newlines": "2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "1.3.1",
-            "json-parse-better-errors": "1.0.1"
-          }
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "4.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "3.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "3.0.0"
-          }
-        },
-        "redent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-          "dev": true,
-          "requires": {
-            "indent-string": "3.2.0",
-            "strip-indent": "2.0.0"
-          }
-        },
-        "semver": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "strip-indent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
-          "dev": true
-        },
-        "trim-newlines": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
-          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
-          "dev": true
-        }
+        "meow": "3.7.0",
+        "semver": "5.3.0"
       }
     },
     "gitconfiglocal": {
@@ -5495,9 +3060,9 @@
       "dev": true
     },
     "gulp-replace": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.6.1.tgz",
-      "integrity": "sha1-Eb+Mj85TPjPi9qjy9DC5VboL4GY=",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz",
+      "integrity": "sha1-aaZ5FLvRPFYr/xT1BKQDeWqg2qk=",
       "dev": true,
       "requires": {
         "istextorbinary": "1.0.2",
@@ -5506,108 +3071,14 @@
       }
     },
     "gulp-tslint": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.3.tgz",
-      "integrity": "sha512-KEP350N5B9Jg6o6jnyCyKVBPemJePYpMsGfIQq0G0ErvY7tw4Lrfb/y3L4WRf7ek0OsaE8nnj86w+lcLXW8ovw==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-6.1.2.tgz",
+      "integrity": "sha1-ni3oLvJaqkN4/Yn+W0Q7Pq9wL+0=",
       "dev": true,
       "requires": {
-        "@types/fancy-log": "1.3.0",
-        "chalk": "2.3.1",
-        "fancy-log": "1.3.2",
-        "map-stream": "0.0.7",
-        "plugin-error": "1.0.1",
+        "gulp-util": "3.0.8",
+        "map-stream": "0.1.0",
         "through": "2.3.8"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.1"
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "arr-union": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-          "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
-          "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "1.0.0",
-            "is-extendable": "1.0.1"
-          }
-        },
-        "fancy-log": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz",
-          "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
-          "dev": true,
-          "requires": {
-            "ansi-gray": "0.1.1",
-            "color-support": "1.1.3",
-            "time-stamp": "1.1.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "2.0.4"
-          }
-        },
-        "plugin-error": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-          "dev": true,
-          "requires": {
-            "ansi-colors": "1.1.0",
-            "arr-diff": "4.0.0",
-            "arr-union": "3.1.0",
-            "extend-shallow": "3.0.2"
-          }
-        },
-        "supports-color": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-          "dev": true,
-          "requires": {
-            "has-flag": "3.0.0"
-          }
-        }
       }
     },
     "gulp-util": {
@@ -5725,15 +3196,6 @@
         "har-schema": "2.0.0"
       }
     },
-    "has": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-      "dev": true,
-      "requires": {
-        "function-bind": "1.1.1"
-      }
-    },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -5743,19 +3205,19 @@
         "ansi-regex": "2.1.1"
       }
     },
-    "has-binary2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz",
-      "integrity": "sha1-6D26SfC5vk0CbSc2U1DZ8D9Uvpg=",
+    "has-binary": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz",
+      "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=",
       "dev": true,
       "requires": {
-        "isarray": "2.0.1"
+        "isarray": "0.0.1"
       },
       "dependencies": {
         "isarray": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
           "dev": true
         }
       }
@@ -5832,17 +3294,6 @@
         "upper-case": "1.1.3"
       }
     },
-    "hipchat-notifier": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz",
-      "integrity": "sha1-ttJJdVQ3wZEII2d5nTupoPI7Ix4=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "lodash": "4.17.5",
-        "request": "2.83.0"
-      }
-    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -5885,12 +3336,6 @@
       "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
       "dev": true
     },
-    "htmlescape": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
-      "integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=",
-      "dev": true
-    },
     "htmlparser2": {
       "version": "3.9.2",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
@@ -5915,14 +3360,6 @@
         "inherits": "2.0.3",
         "setprototypeof": "1.0.3",
         "statuses": "1.4.0"
-      },
-      "dependencies": {
-        "depd": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-          "dev": true
-        }
       }
     },
     "http-proxy": {
@@ -5935,17 +3372,6 @@
         "requires-port": "1.0.0"
       }
     },
-    "http-proxy-agent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz",
-      "integrity": "sha1-zBzjjkU7+YSg93AtLdWcc9CBKEo=",
-      "dev": true,
-      "requires": {
-        "agent-base": "2.1.1",
-        "debug": "2.6.9",
-        "extend": "3.0.1"
-      }
-    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -5957,47 +3383,12 @@
         "sshpk": "1.13.1"
       }
     },
-    "httpntlm": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz",
-      "integrity": "sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=",
-      "dev": true,
-      "requires": {
-        "httpreq": "0.4.24",
-        "underscore": "1.7.0"
-      },
-      "dependencies": {
-        "underscore": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
-          "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=",
-          "dev": true
-        }
-      }
-    },
-    "httpreq": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz",
-      "integrity": "sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=",
-      "dev": true
-    },
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
       "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
       "dev": true
     },
-    "https-proxy-agent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
-      "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
-      "dev": true,
-      "requires": {
-        "agent-base": "2.1.1",
-        "debug": "2.6.9",
-        "extend": "3.0.1"
-      }
-    },
     "iconv-lite": {
       "version": "0.4.19",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
@@ -6025,13 +3416,6 @@
       "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
       "dev": true
     },
-    "inflection": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.10.0.tgz",
-      "integrity": "sha1-W//LEZetPoEFD44X4hZoCH7p6y8=",
-      "dev": true,
-      "optional": true
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -6063,73 +3447,6 @@
         "source-map": "0.5.7"
       }
     },
-    "insert-module-globals": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.2.tgz",
-      "integrity": "sha512-p3s7g96Nm62MbHRuj9ZXab0DuJNWD7qcmdUXCOQ/ZZn42DtDXfsLill7bq19lDCx3K3StypqUnuE3H2VmIJFUw==",
-      "dev": true,
-      "requires": {
-        "JSONStream": "1.3.1",
-        "combine-source-map": "0.7.2",
-        "concat-stream": "1.5.2",
-        "is-buffer": "1.1.6",
-        "lexical-scope": "1.2.0",
-        "process": "0.11.10",
-        "through2": "2.0.3",
-        "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "combine-source-map": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz",
-          "integrity": "sha1-CHAxKFazB6h8xKxIbzqaYq7MwJ4=",
-          "dev": true,
-          "requires": {
-            "convert-source-map": "1.1.3",
-            "inline-source-map": "0.6.2",
-            "lodash.memoize": "3.0.4",
-            "source-map": "0.5.7"
-          }
-        },
-        "concat-stream": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
-          "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3",
-            "readable-stream": "2.0.6",
-            "typedarray": "0.0.6"
-          }
-        },
-        "convert-source-map": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
-          "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "0.10.31",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
     "interpret": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",
@@ -6137,9 +3454,9 @@
       "dev": true
     },
     "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+      "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
       "dev": true,
       "requires": {
         "loose-envify": "1.3.1"
@@ -6151,13 +3468,6 @@
       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
       "dev": true
     },
-    "ip": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz",
-      "integrity": "sha1-x+NWzeoiWucbNtcPLnGpK6TkJZA=",
-      "dev": true,
-      "optional": true
-    },
     "is-absolute": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
@@ -6261,27 +3571,6 @@
         "lower-case": "1.1.4"
       }
     },
-    "is-my-ip-valid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
-      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
-      "dev": true,
-      "optional": true
-    },
-    "is-my-json-valid": {
-      "version": "2.17.2",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz",
-      "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "generate-function": "2.0.0",
-        "generate-object-property": "1.2.0",
-        "is-my-ip-valid": "1.0.0",
-        "jsonpointer": "4.0.1",
-        "xtend": "4.0.1"
-      }
-    },
     "is-number": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -6297,12 +3586,6 @@
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
-    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -6332,13 +3615,6 @@
       "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
       "dev": true
     },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-      "dev": true,
-      "optional": true
-    },
     "is-relative": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
@@ -6450,7 +3726,7 @@
         "esprima": "2.7.3",
         "glob": "5.0.15",
         "handlebars": "4.0.11",
-        "js-yaml": "3.11.0",
+        "js-yaml": "3.10.0",
         "mkdirp": "0.5.1",
         "nopt": "3.0.6",
         "once": "1.4.0",
@@ -6513,9 +3789,9 @@
       }
     },
     "jasmine-core": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.1.0.tgz",
-      "integrity": "sha1-pHheE11d9lAk38kiSVPfWFvSdmw=",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
+      "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
       "dev": true
     },
     "js-tokens": {
@@ -6525,12 +3801,12 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
-      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
       "dev": true,
       "requires": {
-        "argparse": "1.0.10",
+        "argparse": "1.0.9",
         "esprima": "4.0.0"
       },
       "dependencies": {
@@ -6555,12 +3831,6 @@
       "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
       "dev": true
     },
-    "json-parse-better-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz",
-      "integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw==",
-      "dev": true
-    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -6573,21 +3843,18 @@
       "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
       "dev": true
     },
-    "json-stable-stringify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-      "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-      "dev": true,
-      "requires": {
-        "jsonify": "0.0.0"
-      }
-    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
       "dev": true
     },
+    "json3": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "dev": true
+    },
     "json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
@@ -6603,25 +3870,12 @@
         "graceful-fs": "4.1.11"
       }
     },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-      "dev": true
-    },
     "jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
       "dev": true
     },
-    "jsonpointer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-      "dev": true,
-      "optional": true
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -6635,18 +3889,17 @@
       }
     },
     "karma": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-2.0.0.tgz",
-      "integrity": "sha512-K9Kjp8CldLyL9ANSUctDyxC7zH3hpqXj/K09qVf06K3T/kXaHtFZ5tQciK7OzQu68FLvI89Na510kqQ2LCbpIw==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
+      "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
       "dev": true,
       "requires": {
         "bluebird": "3.5.1",
         "body-parser": "1.18.2",
-        "browserify": "14.5.0",
         "chokidar": "1.7.0",
-        "colors": "1.2.1",
+        "colors": "1.1.2",
         "combine-lists": "1.0.1",
-        "connect": "3.6.6",
+        "connect": "3.6.5",
         "core-js": "2.5.1",
         "di": "0.0.1",
         "dom-serialize": "2.2.1",
@@ -6655,31 +3908,31 @@
         "graceful-fs": "4.1.11",
         "http-proxy": "1.16.2",
         "isbinaryfile": "3.0.2",
-        "lodash": "4.17.5",
-        "log4js": "2.5.3",
-        "mime": "1.6.0",
+        "lodash": "3.10.1",
+        "log4js": "0.6.38",
+        "mime": "1.4.1",
         "minimatch": "3.0.4",
         "optimist": "0.6.1",
-        "qjobs": "1.2.0",
+        "qjobs": "1.1.5",
         "range-parser": "1.2.0",
-        "rimraf": "2.6.2",
+        "rimraf": "2.6.1",
         "safe-buffer": "5.1.1",
-        "socket.io": "2.0.4",
-        "source-map": "0.6.1",
-        "tmp": "0.0.33",
-        "useragent": "2.3.0"
+        "socket.io": "1.7.3",
+        "source-map": "0.5.7",
+        "tmp": "0.0.31",
+        "useragent": "2.2.1"
       },
       "dependencies": {
         "colors": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz",
-          "integrity": "sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==",
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
           "dev": true
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
           "dev": true
         }
       }
@@ -6715,9 +3968,9 @@
       }
     },
     "karma-jasmine": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.1.tgz",
-      "integrity": "sha1-b+hA51oRYAydkehLM8RY4cRqNSk=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.0.tgz",
+      "integrity": "sha1-IuTAa/mhguUpTR9wXjczgRuBCs8=",
       "dev": true
     },
     "karma-phantomjs-launcher": {
@@ -6726,51 +3979,58 @@
       "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=",
       "dev": true,
       "requires": {
-        "lodash": "4.17.5",
+        "lodash": "4.17.4",
         "phantomjs-prebuilt": "2.1.16"
       }
     },
     "karma-typescript": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/karma-typescript/-/karma-typescript-3.0.12.tgz",
-      "integrity": "sha1-qiy90RFEKgnG28uq6vSEmWVMaRM=",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/karma-typescript/-/karma-typescript-3.0.8.tgz",
+      "integrity": "sha1-oayGsA2nRNwcA83HgXopgucvEXE=",
       "dev": true,
       "requires": {
         "acorn": "4.0.13",
+        "amdefine": "1.0.0",
         "assert": "1.4.1",
         "async": "2.6.0",
+        "base64-js": "1.2.1",
         "browser-resolve": "1.11.2",
         "browserify-zlib": "0.2.0",
-        "buffer": "5.1.0",
+        "buffer": "5.0.8",
         "combine-source-map": "0.8.0",
         "console-browserify": "1.1.0",
         "constants-browserify": "1.0.0",
-        "convert-source-map": "1.5.1",
+        "convert-source-map": "1.5.0",
         "crypto-browserify": "3.12.0",
-        "diff": "3.5.0",
-        "domain-browser": "1.2.0",
+        "diff": "3.4.0",
+        "domain-browser": "1.1.7",
+        "es6-promise": "4.1.1",
         "events": "1.1.1",
         "glob": "7.1.2",
         "https-browserify": "1.0.0",
+        "ieee754": "1.1.8",
+        "isarray": "1.0.0",
         "istanbul": "0.4.5",
         "json-stringify-safe": "5.0.1",
         "karma-coverage": "1.1.1",
-        "lodash": "4.17.5",
+        "lodash": "4.17.4",
         "log4js": "1.1.1",
+        "magic-string": "0.19.1",
         "minimatch": "3.0.4",
         "os-browserify": "0.3.0",
-        "pad": "2.0.3",
+        "pad": "1.2.1",
         "path-browserify": "0.0.0",
         "process": "0.11.10",
         "punycode": "1.4.1",
         "querystring-es3": "0.2.1",
         "readable-stream": "2.3.3",
-        "remap-istanbul": "0.10.1",
-        "source-map": "0.6.1",
+        "remap-istanbul": "0.8.4",
+        "source-map": "0.5.7",
         "stream-browserify": "2.0.1",
-        "stream-http": "2.8.1",
+        "stream-http": "2.7.2",
         "string_decoder": "1.0.3",
-        "timers-browserify": "2.0.6",
+        "through2": "2.0.1",
+        "timers-browserify": "2.0.4",
         "tmp": "0.0.29",
         "tty-browserify": "0.0.0",
         "url": "0.11.0",
@@ -6778,13 +4038,19 @@
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
+        "amdefine": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
+          "integrity": "sha1-/RdHRwDLXMnCtwnwvp0jzjwZjDM=",
+          "dev": true
+        },
         "async": {
           "version": "2.6.0",
           "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
           "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
           "dev": true,
           "requires": {
-            "lodash": "4.17.5"
+            "lodash": "4.17.4"
           }
         },
         "log4js": {
@@ -6794,15 +4060,41 @@
           "dev": true,
           "requires": {
             "debug": "2.6.9",
-            "semver": "5.5.0",
+            "semver": "5.3.0",
             "streamroller": "0.4.1"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+        "through2": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
+          "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2.0.6",
+            "xtend": "4.0.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.0.6",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+              "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+              "dev": true,
+              "requires": {
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "1.0.7",
+                "string_decoder": "0.10.31",
+                "util-deprecate": "1.0.2"
+              }
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+              "dev": true
+            }
+          }
         },
         "tmp": {
           "version": "0.0.29",
@@ -6816,24 +4108,18 @@
       }
     },
     "karma-typescript-es6-transform": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/karma-typescript-es6-transform/-/karma-typescript-es6-transform-1.0.4.tgz",
-      "integrity": "sha1-CrL9L71fFuc0px9EpMv5GyV75Ag=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/karma-typescript-es6-transform/-/karma-typescript-es6-transform-1.0.2.tgz",
+      "integrity": "sha1-uIuXd+dFDPDaySsBRt0u36mMbTA=",
       "dev": true,
       "requires": {
-        "acorn": "5.5.3",
+        "acorn": "4.0.13",
         "babel-core": "6.26.0",
-        "babel-preset-env": "1.6.1",
+        "babel-preset-es2015": "6.24.1",
         "log4js": "1.1.1",
-        "magic-string": "0.22.5"
+        "magic-string": "0.19.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "5.5.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
-          "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
-          "dev": true
-        },
         "log4js": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/log4js/-/log4js-1.1.1.tgz",
@@ -6841,7 +4127,7 @@
           "dev": true,
           "requires": {
             "debug": "2.6.9",
-            "semver": "5.5.0",
+            "semver": "5.3.0",
             "streamroller": "0.4.1"
           }
         }
@@ -6871,25 +4157,6 @@
         "graceful-fs": "4.1.11"
       }
     },
-    "labeled-stream-splicer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz",
-      "integrity": "sha1-pS4dE4AkwAuGscDJH2d5GLiuClk=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "isarray": "0.0.1",
-        "stream-splicer": "2.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        }
-      }
-    },
     "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -6916,46 +4183,6 @@
         "type-check": "0.3.2"
       }
     },
-    "lexical-scope": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
-      "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
-      "dev": true,
-      "requires": {
-        "astw": "2.2.0"
-      }
-    },
-    "libbase64": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
-      "integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY=",
-      "dev": true
-    },
-    "libmime": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz",
-      "integrity": "sha1-UaGp50SOy9Ms2lRCFnW7IbwJPaY=",
-      "dev": true,
-      "requires": {
-        "iconv-lite": "0.4.15",
-        "libbase64": "0.1.0",
-        "libqp": "1.1.0"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.15",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-          "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=",
-          "dev": true
-        }
-      }
-    },
-    "libqp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
-      "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=",
-      "dev": true
-    },
     "liftoff": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz",
@@ -6986,28 +4213,10 @@
         "strip-bom": "2.0.0"
       }
     },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
-      },
-      "dependencies": {
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
-      }
-    },
     "lodash": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-      "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==",
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
       "dev": true
     },
     "lodash._basecopy": {
@@ -7152,216 +4361,44 @@
       }
     },
     "log4js": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-2.5.3.tgz",
-      "integrity": "sha512-YL/qpTxYtK0iWWbuKCrevDZz5lh+OjyHHD+mICqpjnYGKdNRBvPeh/1uYjkKUemT1CSO4wwLOwphWMpKAnD9kw==",
+      "version": "0.6.38",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
+      "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
       "dev": true,
       "requires": {
-        "amqplib": "0.5.2",
-        "axios": "0.15.3",
-        "circular-json": "0.5.1",
-        "date-format": "1.2.0",
-        "debug": "3.1.0",
-        "hipchat-notifier": "1.1.0",
-        "loggly": "1.1.1",
-        "mailgun-js": "0.7.15",
-        "nodemailer": "2.7.2",
-        "redis": "2.8.0",
-        "semver": "5.5.0",
-        "slack-node": "0.2.0",
-        "streamroller": "0.7.0"
+        "readable-stream": "1.0.34",
+        "semver": "4.3.6"
       },
       "dependencies": {
-        "date-format": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
-          "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
           "dev": true
         },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
           }
         },
-        "streamroller": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-          "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
-          "dev": true,
-          "requires": {
-            "date-format": "1.2.0",
-            "debug": "3.1.0",
-            "mkdirp": "0.5.1",
-            "readable-stream": "2.3.3"
-          }
-        }
-      }
-    },
-    "loggly": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz",
-      "integrity": "sha1-Cg/B0/o6XsRP3HuJe+uipGlc6+4=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "json-stringify-safe": "5.0.1",
-        "request": "2.75.0",
-        "timespan": "2.3.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-          "dev": true,
-          "optional": true
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-          "dev": true,
-          "optional": true
-        },
-        "boom": {
-          "version": "2.10.1",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "caseless": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-          "dev": true,
-          "optional": true
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1"
-          }
-        },
-        "form-data": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz",
-          "integrity": "sha1-bwrrrcxdoWwT4ezBETfYX5uIOyU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.17"
-          }
-        },
-        "har-validator": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "commander": "2.15.0",
-            "is-my-json-valid": "2.17.2",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
           "dev": true
         },
-        "http-signature": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.1",
-            "sshpk": "1.13.1"
-          }
-        },
-        "qs": {
-          "version": "6.2.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
-          "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
-          "dev": true,
-          "optional": true
-        },
-        "request": {
-          "version": "2.75.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.75.0.tgz",
-          "integrity": "sha1-0rgmiihtoT6qXQGt9dGMyQ9lfZM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "bl": "1.1.2",
-            "caseless": "0.11.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.0.0",
-            "har-validator": "2.0.6",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.17",
-            "node-uuid": "1.4.8",
-            "oauth-sign": "0.8.2",
-            "qs": "6.2.3",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.3",
-            "tunnel-agent": "0.4.3"
-          }
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true,
-          "optional": true
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
         }
       }
     },
@@ -7416,91 +4453,14 @@
       }
     },
     "magic-string": {
-      "version": "0.22.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
-      "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.19.1.tgz",
+      "integrity": "sha1-FNdoATyvLsj96hakmvgvw3fnUgE=",
       "dev": true,
       "requires": {
         "vlq": "0.2.3"
       }
     },
-    "mailcomposer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz",
-      "integrity": "sha1-DhxEsqB890DuF9wUm6AJ8Zyt/rQ=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "buildmail": "4.0.1",
-        "libmime": "3.0.0"
-      }
-    },
-    "mailgun-js": {
-      "version": "0.7.15",
-      "resolved": "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.7.15.tgz",
-      "integrity": "sha1-7jZqINrGTDwVwD1sGz4O15UlKrs=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "async": "2.1.5",
-        "debug": "2.2.0",
-        "form-data": "2.1.4",
-        "inflection": "1.10.0",
-        "is-stream": "1.1.0",
-        "path-proxy": "1.0.0",
-        "proxy-agent": "2.0.0",
-        "q": "1.4.1",
-        "tsscmp": "1.0.5"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.1.5.tgz",
-          "integrity": "sha1-5YfGhYCZSsZ/xW/4bTrFa9voELw=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "lodash": "4.17.5"
-          }
-        },
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "0.7.1"
-          }
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.17"
-          }
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-          "dev": true,
-          "optional": true
-        },
-        "q": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-          "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -7514,9 +4474,9 @@
       "dev": true
     },
     "map-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
       "dev": true
     },
     "marked": {
@@ -7569,14 +4529,6 @@
         "read-pkg-up": "1.0.1",
         "redent": "1.0.0",
         "trim-newlines": "1.0.0"
-      },
-      "dependencies": {
-        "decamelize": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-          "dev": true
-        }
       }
     },
     "micromatch": {
@@ -7611,9 +4563,9 @@
       }
     },
     "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
       "dev": true
     },
     "mime-db": {
@@ -7658,16 +4610,6 @@
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
       "dev": true
     },
-    "minimist-options": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
-      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
-      "dev": true,
-      "requires": {
-        "arrify": "1.0.1",
-        "is-plain-obj": "1.1.0"
-      }
-    },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -7700,73 +4642,6 @@
       "integrity": "sha1-4rbN65zhn5kxelNyLz2/XfXqqrI=",
       "dev": true
     },
-    "module-deps": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
-      "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
-      "dev": true,
-      "requires": {
-        "JSONStream": "1.3.1",
-        "browser-resolve": "1.11.2",
-        "cached-path-relative": "1.0.1",
-        "concat-stream": "1.5.2",
-        "defined": "1.0.0",
-        "detective": "4.7.1",
-        "duplexer2": "0.1.4",
-        "inherits": "2.0.3",
-        "parents": "1.0.1",
-        "readable-stream": "2.3.3",
-        "resolve": "1.5.0",
-        "stream-combiner2": "1.1.1",
-        "subarg": "1.0.0",
-        "through2": "2.0.3",
-        "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "concat-stream": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
-          "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3",
-            "readable-stream": "2.0.6",
-            "typedarray": "0.0.6"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.0.6",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-              "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-              "dev": true,
-              "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "1.0.7",
-                "string_decoder": "0.10.31",
-                "util-deprecate": "1.0.2"
-              }
-            }
-          }
-        },
-        "duplexer2": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-          "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "2.3.3"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -7782,13 +4657,6 @@
         "duplexer2": "0.0.2"
       }
     },
-    "nan": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
-      "dev": true,
-      "optional": true
-    },
     "natives": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",
@@ -7801,13 +4669,6 @@
       "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
       "dev": true
     },
-    "netmask": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
-      "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=",
-      "dev": true,
-      "optional": true
-    },
     "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
@@ -7823,111 +4684,12 @@
       "integrity": "sha1-iXNhjXJ9pVJqgwtH0HwNgD4KFcY=",
       "dev": true
     },
-    "node-uuid": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-      "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
-      "dev": true,
-      "optional": true
-    },
     "node-version": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz",
       "integrity": "sha512-t1V2RFiaTavaW3jtQO0A2nok6k7/Gghuvx2rjvICuT0B0dYaObBQ4U0xHL+ZTPFZodt1LMYG2Vi2nypfz4/AJg==",
       "dev": true
     },
-    "nodemailer": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-2.7.2.tgz",
-      "integrity": "sha1-8kLmSa7q45tsftdA73sGHEBNMPk=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "libmime": "3.0.0",
-        "mailcomposer": "4.0.1",
-        "nodemailer-direct-transport": "3.3.2",
-        "nodemailer-shared": "1.1.0",
-        "nodemailer-smtp-pool": "2.8.2",
-        "nodemailer-smtp-transport": "2.7.2",
-        "socks": "1.1.9"
-      },
-      "dependencies": {
-        "ip": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-          "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-          "dev": true,
-          "optional": true
-        },
-        "socks": {
-          "version": "1.1.9",
-          "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz",
-          "integrity": "sha1-Yo1+TQSRJDVEWsC25Fk3bLPm1pE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ip": "1.1.5",
-            "smart-buffer": "1.1.15"
-          }
-        }
-      }
-    },
-    "nodemailer-direct-transport": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz",
-      "integrity": "sha1-6W+vuQNYVglH5WkBfZfmBzilCoY=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nodemailer-shared": "1.1.0",
-        "smtp-connection": "2.12.0"
-      }
-    },
-    "nodemailer-fetch": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz",
-      "integrity": "sha1-ecSQihwPXzdbc/6IjamCj23JY6Q=",
-      "dev": true
-    },
-    "nodemailer-shared": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz",
-      "integrity": "sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=",
-      "dev": true,
-      "requires": {
-        "nodemailer-fetch": "1.6.0"
-      }
-    },
-    "nodemailer-smtp-pool": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz",
-      "integrity": "sha1-LrlNbPhXgLG0clzoU7nL1ejajHI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nodemailer-shared": "1.1.0",
-        "nodemailer-wellknown": "0.1.10",
-        "smtp-connection": "2.12.0"
-      }
-    },
-    "nodemailer-smtp-transport": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz",
-      "integrity": "sha1-A9ccdjFPFKx9vHvwM6am0W1n+3c=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nodemailer-shared": "1.1.0",
-        "nodemailer-wellknown": "0.1.10",
-        "smtp-connection": "2.12.0"
-      }
-    },
-    "nodemailer-wellknown": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz",
-      "integrity": "sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U=",
-      "dev": true
-    },
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -7945,7 +4707,7 @@
       "requires": {
         "hosted-git-info": "2.5.0",
         "is-builtin-module": "1.0.0",
-        "semver": "5.5.0",
+        "semver": "5.3.0",
         "validate-npm-package-license": "3.0.1"
       }
     },
@@ -8005,14 +4767,6 @@
             "string-width": "1.0.2",
             "window-size": "0.1.4",
             "y18n": "3.2.1"
-          },
-          "dependencies": {
-            "decamelize": {
-              "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-              "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-              "dev": true
-            }
           }
         }
       }
@@ -8155,6 +4909,12 @@
         }
       }
     },
+    "options": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
+      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
+      "dev": true
+    },
     "orchestrator": {
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
@@ -8199,80 +4959,25 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
-    "p-limit": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
-      "dev": true,
-      "requires": {
-        "p-try": "1.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "requires": {
-        "p-limit": "1.2.0"
-      }
-    },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true
-    },
-    "pac-proxy-agent": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz",
-      "integrity": "sha512-QBELCWyLYPgE2Gj+4wUEiMscHrQ8nRPBzYItQNOHWavwBt25ohZHQC4qnd5IszdVVrFbLsQ+dPkm6eqdjJAmwQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "agent-base": "2.1.1",
-        "debug": "2.6.9",
-        "extend": "3.0.1",
-        "get-uri": "2.0.1",
-        "http-proxy-agent": "1.0.0",
-        "https-proxy-agent": "1.0.0",
-        "pac-resolver": "2.0.0",
-        "raw-body": "2.3.2",
-        "socks-proxy-agent": "2.1.1"
-      }
-    },
-    "pac-resolver": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-2.0.0.tgz",
-      "integrity": "sha1-mbiNLxk/ve78HJpSnB8yYKtSd80=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "co": "3.0.6",
-        "degenerator": "1.0.4",
-        "ip": "1.0.1",
-        "netmask": "1.0.6",
-        "thunkify": "2.1.2"
-      },
-      "dependencies": {
-        "co": {
-          "version": "3.0.6",
-          "resolved": "https://registry.npmjs.org/co/-/co-3.0.6.tgz",
-          "integrity": "sha1-FEXyJsXrlWE45oyawwFn6n0ua9o=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "pad": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pad/-/pad-2.0.3.tgz",
-      "integrity": "sha512-YVlBmpDQilhUl69RY/0Ku9Il0sNPLgVOVePhCJUfN8qDZKrq1zIY+ZwtCLtaWFtJzuJswwAcZHxf4a5RliV2pQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz",
+      "integrity": "sha512-cx/l/K+9UjGXJmoYolvP0l3cEUyB9BUdUL3wj3uwskIiApboLsinvsXxU9nSNg9Luz2ZyH0zzJNbqgLSNtfIDw==",
       "dev": true,
       "requires": {
+        "coffee-script": "1.12.7",
         "wcwidth": "1.0.1"
       }
     },
+    "pad-right": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz",
+      "integrity": "sha1-b7ySQEXSRPKiokRQMGDTv8YAl3Q=",
+      "dev": true,
+      "requires": {
+        "repeat-string": "1.6.1"
+      }
+    },
     "pako": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
@@ -8288,22 +4993,13 @@
         "no-case": "2.3.2"
       }
     },
-    "parents": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-      "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-      "dev": true,
-      "requires": {
-        "path-platform": "0.11.15"
-      }
-    },
     "parse-asn1": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
       "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
       "dev": true,
       "requires": {
-        "asn1.js": "4.10.1",
+        "asn1.js": "4.9.2",
         "browserify-aes": "1.1.1",
         "create-hash": "1.1.3",
         "evp_bytestokey": "1.0.3",
@@ -8354,6 +5050,15 @@
       "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
       "dev": true
     },
+    "parsejson": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
+      "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
     "parseqs": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
@@ -8424,31 +5129,6 @@
       "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
       "dev": true
     },
-    "path-platform": {
-      "version": "0.11.15",
-      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-      "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
-      "dev": true
-    },
-    "path-proxy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz",
-      "integrity": "sha1-GOijaFn8nS8aU7SN7hOFQ8Ag3l4=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "inflection": "1.3.8"
-      },
-      "dependencies": {
-        "inflection": {
-          "version": "1.3.8",
-          "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz",
-          "integrity": "sha1-y9Fg2p91sUw8xjV41POWeEvzAU4=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "path-root": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
@@ -8485,7 +5165,7 @@
         "create-hmac": "1.1.6",
         "ripemd160": "2.0.1",
         "safe-buffer": "5.1.1",
-        "sha.js": "2.4.10"
+        "sha.js": "2.4.9"
       }
     },
     "pend": {
@@ -8551,37 +5231,6 @@
         "pinkie": "2.0.4"
       }
     },
-    "plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dev": true,
-      "requires": {
-        "ansi-cyan": "0.1.1",
-        "ansi-red": "0.1.1",
-        "arr-diff": "1.1.0",
-        "arr-union": "2.1.0",
-        "extend-shallow": "1.1.4"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "1.1.0",
-            "array-slice": "0.2.3"
-          }
-        },
-        "array-slice": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-          "dev": true
-        }
-      }
-    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -8630,32 +5279,6 @@
       "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI=",
       "dev": true
     },
-    "proxy-agent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.0.0.tgz",
-      "integrity": "sha1-V+tTR6qAXXTsaByyVknbo5yTNJk=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "agent-base": "2.1.1",
-        "debug": "2.6.9",
-        "extend": "3.0.1",
-        "http-proxy-agent": "1.0.0",
-        "https-proxy-agent": "1.0.0",
-        "lru-cache": "2.6.5",
-        "pac-proxy-agent": "1.1.0",
-        "socks-proxy-agent": "2.1.1"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "2.6.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
-          "integrity": "sha1-5W1jVBSO3o13B7WNFDIg/QjfD9U=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -8672,7 +5295,7 @@
         "browserify-rsa": "4.0.1",
         "create-hash": "1.1.3",
         "parse-asn1": "5.1.0",
-        "randombytes": "2.0.6"
+        "randombytes": "2.0.5"
       }
     },
     "punycode": {
@@ -8682,15 +5305,15 @@
       "dev": true
     },
     "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
+      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
       "dev": true
     },
     "qjobs": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz",
+      "integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=",
       "dev": true
     },
     "qs": {
@@ -8712,20 +5335,14 @@
       "dev": true
     },
     "queue": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/queue/-/queue-4.4.2.tgz",
-      "integrity": "sha512-fSMRXbwhMwipcDZ08enW2vl+YDmAmhcNcr43sCJL8DIg+CFOsoRLG23ctxA+fwNk1w55SePSiS7oqQQSgQoVJQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/queue/-/queue-4.2.1.tgz",
+      "integrity": "sha1-UxjtiiJ6lzTmv+6ySgV3gpInUds=",
       "dev": true,
       "requires": {
         "inherits": "2.0.3"
       }
     },
-    "quick-lru": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
-      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
-      "dev": true
-    },
     "randomatic": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
@@ -8768,21 +5385,21 @@
       }
     },
     "randombytes": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
+      "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
       "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
       }
     },
     "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz",
+      "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==",
       "dev": true,
       "requires": {
-        "randombytes": "2.0.6",
+        "randombytes": "2.0.5",
         "safe-buffer": "5.1.1"
       }
     },
@@ -8804,15 +5421,6 @@
         "unpipe": "1.0.0"
       }
     },
-    "read-only-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
-      "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "2.3.3"
-      }
-    },
     "read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -8880,36 +5488,10 @@
         "strip-indent": "1.0.1"
       }
     },
-    "redis": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz",
-      "integrity": "sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "double-ended-queue": "2.1.0-0",
-        "redis-commands": "1.3.5",
-        "redis-parser": "2.6.0"
-      }
-    },
-    "redis-commands": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz",
-      "integrity": "sha512-foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA==",
-      "dev": true,
-      "optional": true
-    },
-    "redis-parser": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz",
-      "integrity": "sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=",
-      "dev": true,
-      "optional": true
-    },
     "reflect-metadata": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.12.tgz",
-      "integrity": "sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==",
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz",
+      "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo=",
       "dev": true
     },
     "regenerate": {
@@ -8919,9 +5501,9 @@
       "dev": true
     },
     "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
+      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
       "dev": true
     },
     "regenerator-transform": {
@@ -8979,19 +5561,77 @@
       }
     },
     "remap-istanbul": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.10.1.tgz",
-      "integrity": "sha512-gsNQXs5kJLhErICSyYhzVZ++C8LBW8dgwr874Y2QvzAUS75zBlD/juZgXs39nbYJ09fZDlX2AVLVJAY2jbFJoQ==",
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.8.4.tgz",
+      "integrity": "sha1-tL/f28kO+mNemiix9KEW4iyMJpc=",
       "dev": true,
       "requires": {
         "amdefine": "1.0.1",
+        "gulp-util": "3.0.7",
         "istanbul": "0.4.5",
-        "minimatch": "3.0.4",
-        "plugin-error": "0.1.2",
-        "source-map": "0.6.1",
+        "source-map": "0.5.7",
         "through2": "2.0.1"
       },
       "dependencies": {
+        "gulp-util": {
+          "version": "3.0.7",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
+          "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=",
+          "dev": true,
+          "requires": {
+            "array-differ": "1.0.0",
+            "array-uniq": "1.0.3",
+            "beeper": "1.1.1",
+            "chalk": "1.1.3",
+            "dateformat": "1.0.12",
+            "fancy-log": "1.3.0",
+            "gulplog": "1.0.0",
+            "has-gulplog": "0.1.0",
+            "lodash._reescape": "3.0.0",
+            "lodash._reevaluate": "3.0.0",
+            "lodash._reinterpolate": "3.0.0",
+            "lodash.template": "3.6.2",
+            "minimist": "1.2.0",
+            "multipipe": "0.1.2",
+            "object-assign": "3.0.0",
+            "replace-ext": "0.0.1",
+            "through2": "2.0.1",
+            "vinyl": "0.5.3"
+          }
+        },
+        "lodash.template": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+          "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+          "dev": true,
+          "requires": {
+            "lodash._basecopy": "3.0.1",
+            "lodash._basetostring": "3.0.1",
+            "lodash._basevalues": "3.0.0",
+            "lodash._isiterateecall": "3.0.9",
+            "lodash._reinterpolate": "3.0.0",
+            "lodash.escape": "3.2.0",
+            "lodash.keys": "3.1.2",
+            "lodash.restparam": "3.6.1",
+            "lodash.templatesettings": "3.1.1"
+          }
+        },
+        "lodash.templatesettings": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+          "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+          "dev": true,
+          "requires": {
+            "lodash._reinterpolate": "3.0.0",
+            "lodash.escape": "3.2.0"
+          }
+        },
+        "object-assign": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+          "dev": true
+        },
         "readable-stream": {
           "version": "2.0.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
@@ -9006,12 +5646,6 @@
             "util-deprecate": "1.0.2"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
         "string_decoder": {
           "version": "0.10.31",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
@@ -9121,19 +5755,6 @@
         "throttleit": "1.0.0"
       }
     },
-    "requestretry": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz",
-      "integrity": "sha512-Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "extend": "3.0.1",
-        "lodash": "4.17.5",
-        "request": "2.83.0",
-        "when": "3.7.8"
-      }
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -9176,9 +5797,9 @@
       "dev": true
     },
     "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
       "dev": true,
       "requires": {
         "glob": "7.1.2"
@@ -9195,12 +5816,12 @@
       }
     },
     "rxjs": {
-      "version": "5.5.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.7.tgz",
-      "integrity": "sha512-Hxo2ac8gRQjwjtKgukMIwBRbq5+KAeEV5hXM4obYBOAghev41bDQWgFH4svYiU9UnQ5kNww2LgfyBdevCd2HXA==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
+      "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
       "dev": true,
       "requires": {
-        "symbol-observable": "1.0.1"
+        "symbol-observable": "1.0.4"
       }
     },
     "safe-buffer": {
@@ -9210,9 +5831,9 @@
       "dev": true
     },
     "semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
       "dev": true
     },
     "sentence-case": {
@@ -9250,37 +5871,15 @@
       "dev": true
     },
     "sha.js": {
-      "version": "2.4.10",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
-      "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==",
+      "version": "2.4.9",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz",
+      "integrity": "sha512-G8zektVqbiPHrylgew9Zg1VRB1L/DtXNUVAM6q4QLy8NE3qtHlFXTf8VLL4k1Yl6c7NMjtZUTdXV+X44nFaT6A==",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
         "safe-buffer": "5.1.1"
       }
     },
-    "shasum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
-      "integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=",
-      "dev": true,
-      "requires": {
-        "json-stable-stringify": "0.0.1",
-        "sha.js": "2.4.10"
-      }
-    },
-    "shell-quote": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
-      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-      "dev": true,
-      "requires": {
-        "array-filter": "0.0.1",
-        "array-map": "0.0.0",
-        "array-reduce": "0.0.0",
-        "jsonify": "0.0.0"
-      }
-    },
     "shelljs": {
       "version": "0.7.8",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
@@ -9304,38 +5903,12 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
       "dev": true
     },
-    "slack-node": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz",
-      "integrity": "sha1-3kuN3aqLeT9h29KTgQT9q/N9+jA=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "requestretry": "1.13.0"
-      }
-    },
     "slash": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
       "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
       "dev": true
     },
-    "smart-buffer": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz",
-      "integrity": "sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=",
-      "dev": true
-    },
-    "smtp-connection": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz",
-      "integrity": "sha1-1275EnyyPCJZ7bHoNJwujV4tdME=",
-      "dev": true,
-      "requires": {
-        "httpntlm": "1.6.1",
-        "nodemailer-shared": "1.1.0"
-      }
-    },
     "snake-case": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz",
@@ -9355,103 +5928,147 @@
       }
     },
     "socket.io": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz",
-      "integrity": "sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz",
+      "integrity": "sha1-uK+cq6AJSeVo42nxMn6pvp6iRhs=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "engine.io": "3.1.5",
-        "socket.io-adapter": "1.1.1",
-        "socket.io-client": "2.0.4",
-        "socket.io-parser": "3.1.3"
-      }
-    },
-    "socket.io-adapter": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
-      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
-      "dev": true
-    },
-    "socket.io-client": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz",
-      "integrity": "sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=",
-      "dev": true,
-      "requires": {
-        "backo2": "1.0.2",
-        "base64-arraybuffer": "0.1.5",
-        "component-bind": "1.0.0",
-        "component-emitter": "1.2.1",
-        "debug": "2.6.9",
-        "engine.io-client": "3.1.6",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "object-component": "0.0.3",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "socket.io-parser": "3.1.3",
-        "to-array": "0.1.4"
-      }
-    },
-    "socket.io-parser": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz",
-      "integrity": "sha512-g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==",
-      "dev": true,
-      "requires": {
-        "component-emitter": "1.2.1",
-        "debug": "3.1.0",
-        "has-binary2": "1.0.2",
-        "isarray": "2.0.1"
+        "debug": "2.3.3",
+        "engine.io": "1.8.3",
+        "has-binary": "0.1.7",
+        "object-assign": "4.1.0",
+        "socket.io-adapter": "0.5.0",
+        "socket.io-client": "1.7.3",
+        "socket.io-parser": "2.3.1"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
+          "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-adapter": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz",
+      "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=",
+      "dev": true,
+      "requires": {
+        "debug": "2.3.3",
+        "socket.io-parser": "2.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-client": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz",
+      "integrity": "sha1-sw6GqhDV7zVGYBwJzeR2Xjgdo3c=",
+      "dev": true,
+      "requires": {
+        "backo2": "1.0.2",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.1",
+        "debug": "2.3.3",
+        "engine.io-client": "1.8.3",
+        "has-binary": "0.1.7",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseuri": "0.0.5",
+        "socket.io-parser": "2.3.1",
+        "to-array": "0.1.4"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz",
+      "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.1.2",
+        "debug": "2.2.0",
+        "isarray": "0.0.1",
+        "json3": "3.3.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
           }
         },
         "isarray": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
           "dev": true
         }
       }
     },
-    "socks": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz",
-      "integrity": "sha1-W4t/x8jzQcU+0FbpKbe/Tei6e1o=",
-      "dev": true,
-      "requires": {
-        "ip": "1.1.5",
-        "smart-buffer": "1.1.15"
-      },
-      "dependencies": {
-        "ip": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-          "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-          "dev": true
-        }
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz",
-      "integrity": "sha512-sFtmYqdUK5dAMh85H0LEVFUCO7OhJJe1/z2x/Z6mxp3s7/QPf1RkZmpZy+BpuU0bEjcV9npqKjq9Y3kwFUjnxw==",
-      "dev": true,
-      "requires": {
-        "agent-base": "2.1.1",
-        "extend": "3.0.1",
-        "socks": "1.1.10"
-      }
-    },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -9562,27 +6179,6 @@
         "readable-stream": "2.3.3"
       }
     },
-    "stream-combiner2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
-      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
-      "dev": true,
-      "requires": {
-        "duplexer2": "0.1.4",
-        "readable-stream": "2.3.3"
-      },
-      "dependencies": {
-        "duplexer2": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-          "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "2.3.3"
-          }
-        }
-      }
-    },
     "stream-consume": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
@@ -9590,9 +6186,9 @@
       "dev": true
     },
     "stream-http": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz",
-      "integrity": "sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A==",
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
+      "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
       "dev": true,
       "requires": {
         "builtin-status-codes": "3.0.0",
@@ -9602,16 +6198,6 @@
         "xtend": "4.0.1"
       }
     },
-    "stream-splicer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz",
-      "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
-      }
-    },
     "streamroller": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.4.1.tgz",
@@ -9715,15 +6301,6 @@
         "get-stdin": "4.0.1"
       }
     },
-    "subarg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-      "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
-      "dev": true,
-      "requires": {
-        "minimist": "1.2.0"
-      }
-    },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -9741,20 +6318,11 @@
       }
     },
     "symbol-observable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
-      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
+      "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=",
       "dev": true
     },
-    "syntax-error": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
-      "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
-      "dev": true,
-      "requires": {
-        "acorn-node": "1.3.0"
-      }
-    },
     "tempfile": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz",
@@ -9799,13 +6367,6 @@
         "xtend": "4.0.1"
       }
     },
-    "thunkify": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
-      "integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
-      "dev": true,
-      "optional": true
-    },
     "tildify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
@@ -9822,21 +6383,14 @@
       "dev": true
     },
     "timers-browserify": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz",
-      "integrity": "sha512-HQ3nbYRAowdVd0ckGFvmJPPCOH/CHleFN/Y0YQCX1DVaB7t+KFvisuyN09fuP8Jtp1CpfSh8O8bMkHbdbPe6Pw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
+      "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
       "dev": true,
       "requires": {
         "setimmediate": "1.0.5"
       }
     },
-    "timespan": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz",
-      "integrity": "sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=",
-      "dev": true,
-      "optional": true
-    },
     "title-case": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz",
@@ -9848,9 +6402,9 @@
       }
     },
     "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
+      "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
       "dev": true,
       "requires": {
         "os-tmpdir": "1.0.2"
@@ -9902,139 +6456,93 @@
       "dev": true
     },
     "tsickle": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.27.2.tgz",
-      "integrity": "sha512-KW+ZgY0t2cq2Qib1sfdgMiRnk+cr3brUtzZoVWjv+Ot3jNxVorFBUH+6In6hl8Dg7BI2AAFf69NHkwvZNMSFwA==",
+      "version": "0.21.6",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz",
+      "integrity": "sha1-U7Abl5xcE/2xOvs/uVgXflmRWI0=",
       "dev": true,
       "requires": {
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
-        "source-map": "0.6.1",
-        "source-map-support": "0.5.4"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.5.4",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz",
-          "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==",
-          "dev": true,
-          "requires": {
-            "source-map": "0.6.1"
-          }
-        }
+        "source-map": "0.5.7",
+        "source-map-support": "0.4.18"
       }
     },
     "tslib": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz",
-      "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz",
+      "integrity": "sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg==",
       "dev": true
     },
     "tslint": {
-      "version": "5.9.1",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.9.1.tgz",
-      "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=",
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-3.15.1.tgz",
+      "integrity": "sha1-2hZcqT2P3CwIa1EWXuG6y0jJjqU=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "builtin-modules": "1.1.1",
-        "chalk": "2.3.2",
-        "commander": "2.15.0",
-        "diff": "3.5.0",
+        "colors": "1.1.2",
+        "diff": "2.2.3",
+        "findup-sync": "0.3.0",
         "glob": "7.1.2",
-        "js-yaml": "3.11.0",
-        "minimatch": "3.0.4",
+        "optimist": "0.6.1",
         "resolve": "1.5.0",
-        "semver": "5.5.0",
-        "tslib": "1.9.0",
-        "tsutils": "2.22.2"
+        "underscore.string": "3.3.4"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.1"
-          }
-        },
-        "chalk": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+        "colors": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
           "dev": true
         },
-        "supports-color": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+        "diff": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz",
+          "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=",
+          "dev": true
+        },
+        "findup-sync": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+          "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "glob": "5.0.15"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "5.0.15",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+              "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+              "dev": true,
+              "requires": {
+                "inflight": "1.0.6",
+                "inherits": "2.0.3",
+                "minimatch": "3.0.4",
+                "once": "1.4.0",
+                "path-is-absolute": "1.0.1"
+              }
+            }
           }
         }
       }
     },
     "tslint-eslint-rules": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
-      "integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-1.6.1.tgz",
+      "integrity": "sha1-OekvMZVq0qZsAGHDUfqWwICK4Pg=",
       "dev": true,
       "requires": {
         "doctrine": "0.7.2",
-        "tslib": "1.9.0",
-        "tsutils": "1.9.1"
-      },
-      "dependencies": {
-        "tsutils": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
-          "integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
-          "dev": true
-        }
+        "tslint": "3.15.1"
       }
     },
     "tslint-ionic-rules": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/tslint-ionic-rules/-/tslint-ionic-rules-0.0.9.tgz",
-      "integrity": "sha512-k9HQoN+vK9ivDDF9O+HrMDZMFLmxNeoXelZiPTeawbyc8cmH0GLi66G2B6OTaz1NFg/Hiv4Ry5cy6vWiPEVlZQ==",
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/tslint-ionic-rules/-/tslint-ionic-rules-0.0.8.tgz",
+      "integrity": "sha1-au1vjjzUBlIzAdHW0Db38DbdKAk=",
       "dev": true,
       "requires": {
-        "tslint-eslint-rules": "4.1.1"
-      }
-    },
-    "tsscmp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz",
-      "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=",
-      "dev": true,
-      "optional": true
-    },
-    "tsutils": {
-      "version": "2.22.2",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.22.2.tgz",
-      "integrity": "sha512-u06FUSulCJ+Y8a2ftuqZN6kIGqdP2yJjUPEngXqmdPND4UQfb04igcotH+dw+IFr417yP6muCLE8/5/Qlfnx0w==",
-      "dev": true,
-      "requires": {
-        "tslib": "1.9.0"
+        "tslint-eslint-rules": "1.6.1"
       }
     },
     "tty-browserify": {
@@ -10069,30 +6577,13 @@
       }
     },
     "type-is": {
-      "version": "1.6.16",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "version": "1.6.15",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
+      "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "2.1.18"
-      },
-      "dependencies": {
-        "mime-db": {
-          "version": "1.33.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-          "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.18",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-          "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-          "dev": true,
-          "requires": {
-            "mime-db": "1.33.0"
-          }
-        }
+        "mime-types": "2.1.17"
       }
     },
     "typedarray": {
@@ -10102,9 +6593,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
-      "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
+      "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
       "dev": true
     },
     "uglify-js": {
@@ -10127,15 +6618,9 @@
       "optional": true
     },
     "ultron": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-      "dev": true
-    },
-    "umd": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
-      "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
+      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
       "dev": true
     },
     "unc-path-regex": {
@@ -10159,18 +6644,22 @@
         "underscore": "1.6.0"
       }
     },
+    "underscore.string": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
+      "integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3",
+        "util-deprecate": "1.0.2"
+      }
+    },
     "unique-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
       "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
       "dev": true
     },
-    "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
-      "dev": true
-    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -10217,13 +6706,21 @@
       "dev": true
     },
     "useragent": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
+      "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.1",
-        "tmp": "0.0.33"
+        "lru-cache": "2.2.4",
+        "tmp": "0.0.31"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
+          "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
+          "dev": true
+        }
       }
     },
     "util": {
@@ -10261,13 +6758,6 @@
       "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
       "dev": true
     },
-    "uws": {
-      "version": "9.14.0",
-      "resolved": "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz",
-      "integrity": "sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==",
-      "dev": true,
-      "optional": true
-    },
     "v8flags": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
@@ -10432,13 +6922,6 @@
         "defaults": "1.0.3"
       }
     },
-    "when": {
-      "version": "3.7.8",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
-      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=",
-      "dev": true,
-      "optional": true
-    },
     "which": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
@@ -10456,9 +6939,9 @@
       "optional": true
     },
     "winston": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.1.tgz",
-      "integrity": "sha512-k/+Dkzd39ZdyJHYkuaYmf4ff+7j+sCIy73UCOWHYA67/WXU+FF/Y6PF28j+Vy7qNRPHWO+dR+/+zkoQWPimPqg==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.0.tgz",
+      "integrity": "sha1-gIBQuT1SZh7Z+2wms/DIJnCLCu4=",
       "dev": true,
       "requires": {
         "async": "1.0.0",
@@ -10506,28 +6989,26 @@
       "dev": true
     },
     "ws": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz",
+      "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=",
       "dev": true,
       "requires": {
-        "async-limiter": "1.0.0",
-        "safe-buffer": "5.1.1",
-        "ultron": "1.1.1"
+        "options": "0.0.6",
+        "ultron": "1.0.2"
       }
     },
-    "xmlhttprequest-ssl": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
-      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
+    "wtf-8": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz",
+      "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=",
       "dev": true
     },
-    "xregexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
-      "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
-      "dev": true,
-      "optional": true
+    "xmlhttprequest-ssl": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
+      "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=",
+      "dev": true
     },
     "xtend": {
       "version": "4.0.1",
@@ -10566,13 +7047,6 @@
           "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
           "dev": true,
           "optional": true
-        },
-        "decamelize": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-          "dev": true,
-          "optional": true
         }
       }
     },
@@ -10592,9 +7066,9 @@
       "dev": true
     },
     "zone.js": {
-      "version": "0.8.20",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.20.tgz",
-      "integrity": "sha512-FXlA37ErSXCMy5RNBcGFgCI/Zivqzr0D19GuvDxhcYIJc7xkFp6c29DKyODJu0Zo+EMyur/WPPgcBh1EHjB9jA==",
+      "version": "0.8.18",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz",
+      "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index 0e95931a8..dfead97ca 100644
--- a/package.json
+++ b/package.json
@@ -6,44 +6,45 @@
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
   "license": "MIT",
   "devDependencies": {
-    "@angular/compiler": "5.2.9",
-    "@angular/compiler-cli": "5.2.9",
-    "@angular/core": "5.2.9",
+    "@angular/compiler": "4.4.4",
+    "@angular/compiler-cli": "4.4.4",
+    "@angular/core": "4.4.4",
     "@types/cordova": "0.0.34",
-    "@types/jasmine": "^2.8.6",
-    "@types/node": "^8.9.5",
+    "@types/jasmine": "^2.6.3",
+    "@types/node": "^8.0.50",
     "canonical-path": "0.0.2",
     "child-process-promise": "2.2.1",
-    "conventional-changelog-cli": "^1.3.16",
-    "cpr": "^3.0.1",
-    "cz-conventional-changelog": "^2.1.0",
-    "decamelize": "^2.0.0",
-    "dgeni": "^0.4.9",
+    "conventional-changelog-cli": "1.3.4",
+    "cpr": "2.0.0",
+    "cz-conventional-changelog": "2.0.0",
+    "decamelize": "1.2.0",
+    "dgeni": "0.4.7",
     "dgeni-packages": "0.16.10",
-    "fs-extra": "^5.0.0",
+    "fs-extra": "2.0.0",
+    "fs-extra-promise": "0.4.1",
     "gulp": "3.9.1",
     "gulp-rename": "1.2.2",
-    "gulp-replace": "^0.6.1",
-    "gulp-tslint": "^8.1.3",
-    "jasmine-core": "^3.1.0",
-    "karma": "^2.0.0",
+    "gulp-replace": "0.5.4",
+    "gulp-tslint": "6.1.2",
+    "jasmine-core": "^2.6.1",
+    "karma": "^1.7.0",
     "karma-cli": "^1.0.1",
-    "karma-jasmine": "^1.1.1",
+    "karma-jasmine": "^1.1.0",
     "karma-phantomjs-launcher": "^1.0.4",
-    "karma-typescript": "^3.0.12",
-    "karma-typescript-es6-transform": "^1.0.4",
-    "lodash": "^4.17.5",
+    "karma-typescript": "^3.0.1",
+    "karma-typescript-es6-transform": "^1.0.0",
+    "lodash": "4.17.4",
     "minimist": "1.2.0",
     "node-html-encoder": "0.0.2",
-    "q": "^1.5.1",
-    "queue": "^4.4.2",
-    "rimraf": "^2.6.2",
-    "rxjs": "^5.5.7",
-    "semver": "^5.5.0",
-    "tslint": "^5.9.1",
-    "tslint-ionic-rules": "0.0.9",
-    "typescript": "~2.6.2",
-    "zone.js": "0.8.20"
+    "q": "1.5.0",
+    "queue": "4.2.1",
+    "rimraf": "2.6.1",
+    "rxjs": "5.5.2",
+    "semver": "5.3.0",
+    "tslint": "3.15.1",
+    "tslint-ionic-rules": "0.0.8",
+    "typescript": "~2.4.2",
+    "zone.js": "0.8.18"
   },
   "scripts": {
     "start": "npm run test:watch",
diff --git a/scripts/build/build.js b/scripts/build/build.js
index 6d3549111..cae297b8b 100644
--- a/scripts/build/build.js
+++ b/scripts/build/build.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 // Node module dependencies
-const fs = require('fs-extra'),
+const fs = require('fs-extra-promise').useFs(require('fs-extra')),
   queue = require('queue'),
   path = require('path'),
   exec = require('child_process').exec;
@@ -15,6 +15,7 @@ const ROOT = path.resolve(path.join(__dirname, '../../')), // root ionic-native
   BUILD_DIST_ROOT = path.resolve(ROOT, 'dist/@ionic-native'), // dist directory root path
   BUILD_CORE_DIST = path.resolve(BUILD_DIST_ROOT, 'core'); // core dist directory path
 
+
 // dependency versions
 const ANGULAR_VERSION = '*',
   RXJS_VERSION = '^5.0.1',
@@ -23,13 +24,13 @@ const ANGULAR_VERSION = '*',
 
 // package dependencies
 const CORE_PEER_DEPS = {
-  rxjs: RXJS_VERSION
+  'rxjs': RXJS_VERSION
 };
 
 const PLUGIN_PEER_DEPS = {
   '@ionic-native/core': MIN_CORE_VERSION,
   '@angular/core': ANGULAR_VERSION,
-  rxjs: RXJS_VERSION
+  'rxjs': RXJS_VERSION
 };
 
 // set peer dependencies for all plugins
@@ -43,10 +44,8 @@ fs.mkdirpSync(BUILD_TMP);
 console.log('Preparing core module package.json');
 CORE_PACKAGE_JSON.version = IONIC_NATIVE_VERSION;
 CORE_PACKAGE_JSON.peerDependencies = CORE_PEER_DEPS;
-fs.writeJsonSync(
-  path.resolve(BUILD_CORE_DIST, 'package.json'),
-  CORE_PACKAGE_JSON
-);
+fs.writeJsonSync(path.resolve(BUILD_CORE_DIST, 'package.json'), CORE_PACKAGE_JSON);
+
 
 // Fetch a list of the plugins
 const PLUGINS = fs.readdirSync(PLUGINS_PATH);
@@ -60,9 +59,7 @@ const index = pluginsToBuild.indexOf('ignore-errors');
 if (index > -1) {
   ignoreErrors = true;
   pluginsToBuild.splice(index, 1);
-  console.log(
-    'Build will continue even if errors were thrown. Errors will be printed when build finishes.'
-  );
+  console.log('Build will continue even if errors were thrown. Errors will be printed when build finishes.');
 }
 
 if (!pluginsToBuild.length) {
@@ -74,9 +71,12 @@ const QUEUE = queue({
   concurrency: require('os').cpus().length
 });
 
+
 // Function to process a single plugin
 const addPluginToQueue = pluginName => {
-  QUEUE.push(callback => {
+
+  QUEUE.push((callback) => {
+
     console.log(`Building plugin: ${pluginName}`);
 
     const PLUGIN_BUILD_DIR = path.resolve(BUILD_TMP, 'plugins', pluginName),
@@ -84,10 +84,10 @@ const addPluginToQueue = pluginName => {
 
     let tsConfigPath;
 
-    fs
-      .mkdirs(PLUGIN_BUILD_DIR) // create tmp build dir
-      .then(() => fs.mkdirs(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir
+    fs.mkdirpAsync(PLUGIN_BUILD_DIR) // create tmp build dir
+      .then(() => fs.mkdirpAsync(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir
       .then(() => {
+
         // Write tsconfig.json
         const tsConfig = JSON.parse(JSON.stringify(PLUGIN_TS_CONFIG));
         tsConfig.files = [PLUGIN_SRC_PATH];
@@ -95,7 +95,7 @@ const addPluginToQueue = pluginName => {
 
         tsConfigPath = path.resolve(PLUGIN_BUILD_DIR, 'tsconfig.json');
 
-        return fs.writeJson(tsConfigPath, tsConfig);
+        return fs.writeJsonAsync(tsConfigPath, tsConfig);
       })
       .then(() => {
         // clone package.json
@@ -104,39 +104,42 @@ const addPluginToQueue = pluginName => {
         packageJson.name = `@ionic-native/${pluginName}`;
         packageJson.version = IONIC_NATIVE_VERSION;
 
-        return fs.writeJson(
-          path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'),
-          packageJson
-        );
+        return fs.writeJsonAsync(path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'), packageJson);
       })
       .then(() => {
+
         // compile the plugin
-        exec(
-          `${ROOT}/node_modules/.bin/ngc -p ${tsConfigPath}`,
-          (err, stdout, stderr) => {
-            if (err) {
-              if (!ignoreErrors) {
-                // oops! something went wrong.
-                console.log(err);
-                callback(`\n\nBuilding ${pluginName} failed.`);
-                return;
-              } else {
-                errors.push(err);
-              }
+        exec(`${ROOT}/node_modules/.bin/ngc -p ${tsConfigPath}`, (err, stdout, stderr) => {
+
+          if (err) {
+
+            if (!ignoreErrors) {
+              // oops! something went wrong.
+              console.log(err);
+              callback(`\n\nBuilding ${pluginName} failed.`);
+              return;
+            } else {
+              errors.push(err);
             }
 
-            // we're done with this plugin!
-            callback();
           }
-        );
+
+          // we're done with this plugin!
+          callback();
+
+        });
+
       })
       .catch(callback);
+
   }); // QUEUE.push end
+
 };
 
 pluginsToBuild.forEach(addPluginToQueue);
 
-QUEUE.start(err => {
+QUEUE.start((err) => {
+
   if (err) {
     console.log('Error building plugins.');
     console.log(err);
@@ -152,4 +155,5 @@ QUEUE.start(err => {
   } else {
     console.log('Done processing plugins!');
   }
+
 });
diff --git a/scripts/build/publish.js b/scripts/build/publish.js
index bf7560c15..184dda82d 100644
--- a/scripts/build/publish.js
+++ b/scripts/build/publish.js
@@ -1,10 +1,11 @@
-'use strict';
+"use strict";
 // Node module dependencies
-const fs = require('fs-extra'),
+const fs = require('fs-extra-promise').useFs(require('fs-extra')),
   queue = require('queue'),
   path = require('path'),
   exec = require('child-process-promise').exec;
 
+
 const ROOT = path.resolve(path.join(__dirname, '../../')),
   DIST = path.resolve(ROOT, 'dist', '@ionic-native');
 
@@ -19,16 +20,15 @@ const QUEUE = queue({
 });
 
 PACKAGES.forEach(packageName => {
+
   QUEUE.push(done => {
+
     console.log(`Publishing @ionic-native/${packageName}`);
     const packagePath = path.resolve(DIST, packageName);
     exec(`npm publish ${packagePath} ${FLAGS}`)
       .then(() => done())
-      .catch(e => {
-        if (
-          e.stderr &&
-          e.stderr.indexOf('previously published version') === -1
-        ) {
+      .catch((e) => {
+        if (e.stderr && e.stderr.indexOf('previously published version') === -1) {
           failedPackages.push({
             cmd: e.cmd,
             stderr: e.stderr
@@ -36,10 +36,13 @@ PACKAGES.forEach(packageName => {
         }
         done();
       });
+
   });
+
 });
 
-QUEUE.start(err => {
+QUEUE.start((err) => {
+
   if (err) {
     console.log('Error publishing ionic-native. ', err);
   } else if (failedPackages.length > 0) {
@@ -48,4 +51,8 @@ QUEUE.start(err => {
   } else {
     console.log('Done publishing ionic-native!');
   }
+
+
+
 });
+
diff --git a/scripts/docs/gulp-tasks.js b/scripts/docs/gulp-tasks.js
index a7d3ed55d..81a10aa45 100644
--- a/scripts/docs/gulp-tasks.js
+++ b/scripts/docs/gulp-tasks.js
@@ -1,40 +1,39 @@
-'use strict';
+"use strict";
 const config = require('../config.json'),
   projectPackage = require('../../package.json'),
   path = require('path'),
-  fs = require('fs-extra'),
+  fs = require('fs-extra-promise').useFs(require('fs-extra')),
   Dgeni = require('dgeni');
 
 module.exports = gulp => {
   gulp.task('docs', [], () => {
+
     try {
+
       const ionicPackage = require('./dgeni-config')(projectPackage.version),
         dgeni = new Dgeni([ionicPackage]);
 
-      return dgeni
-        .generate()
-        .then(docs => console.log(docs.length + ' docs generated'));
+      return dgeni.generate().then(docs => console.log(docs.length + ' docs generated'));
+
     } catch (err) {
       console.log(err.stack);
     }
+
   });
 
   gulp.task('readmes', [], function() {
-    fs.copySync(
-      path.resolve(__dirname, '..', '..', 'README.md'),
-      path.resolve(__dirname, '..', '..', config.pluginDir, 'core', 'README.md')
-    );
+
+    fs.copySync(path.resolve(__dirname, '..', '..', 'README.md'), path.resolve(__dirname, '..', '..', config.pluginDir, 'core', 'README.md'));
 
     try {
-      const ionicPackage = require('./dgeni-readmes-config')(
-          projectPackage.version
-        ),
+
+      const ionicPackage = require('./dgeni-readmes-config')(projectPackage.version),
         dgeni = new Dgeni([ionicPackage]);
-      return dgeni
-        .generate()
-        .then(docs => console.log(docs.length + ' README files generated'));
+      return dgeni.generate().then(docs => console.log(docs.length + ' README files generated'));
+
     } catch (err) {
       console.log(err.stack);
     }
+
   });
 };
diff --git a/src/@ionic-native/core/bootstrap.ts b/src/@ionic-native/core/bootstrap.ts
index 8f590d1cd..09ac37f15 100644
--- a/src/@ionic-native/core/bootstrap.ts
+++ b/src/@ionic-native/core/bootstrap.ts
@@ -9,17 +9,13 @@ export function checkReady() {
 
   let didFireReady = false;
   document.addEventListener('deviceready', () => {
-    console.log(
-      `Ionic Native: deviceready event fired after ${Date.now() - before} ms`
-    );
+    console.log(`Ionic Native: deviceready event fired after ${(Date.now() - before)} ms`);
     didFireReady = true;
   });
 
   setTimeout(() => {
     if (!didFireReady && !!window.cordova) {
-      console.warn(
-        `Ionic Native: deviceready did not fire within ${DEVICE_READY_TIMEOUT}ms. This can happen when plugins are in an inconsistent state. Try removing plugins from plugins/ and reinstalling them.`
-      );
+      console.warn(`Ionic Native: deviceready did not fire within ${DEVICE_READY_TIMEOUT}ms. This can happen when plugins are in an inconsistent state. Try removing plugins from plugins/ and reinstalling them.`);
     }
   }, DEVICE_READY_TIMEOUT);
 }
diff --git a/src/@ionic-native/core/decorators.spec.ts b/src/@ionic-native/core/decorators.spec.ts
index b8a8e97a2..534a135f8 100644
--- a/src/@ionic-native/core/decorators.spec.ts
+++ b/src/@ionic-native/core/decorators.spec.ts
@@ -1,34 +1,24 @@
 import 'core-js';
-
-import { Observable } from 'rxjs/Observable';
-
-import {
-  Cordova,
-  CordovaCheck,
-  CordovaInstance,
-  CordovaProperty,
-  InstanceProperty,
-  Plugin
-} from './decorators';
+import { Plugin, Cordova, CordovaProperty, CordovaCheck, CordovaInstance, InstanceProperty } from './decorators';
 import { IonicNativePlugin } from './ionic-native-plugin';
 import { ERR_CORDOVA_NOT_AVAILABLE, ERR_PLUGIN_NOT_INSTALLED } from './plugin';
+import { Observable } from 'rxjs/Observable';
 
 declare const window: any;
 
 class TestObject {
+
   constructor(public _objectInstance: any) {}
 
-  @InstanceProperty name: string;
+  @InstanceProperty
+  name: string;
 
   @CordovaInstance({ sync: true })
-  pingSync(): string {
-    return;
-  }
+  pingSync(): string { return; }
 
   @CordovaInstance()
-  ping(): Promise<any> {
-    return;
-  }
+  ping(): Promise<any> { return; }
+
 }
 
 @Plugin({
@@ -39,17 +29,15 @@ class TestObject {
   platforms: ['Android', 'iOS']
 })
 class TestPlugin extends IonicNativePlugin {
-  @CordovaProperty name: string;
+
+  @CordovaProperty
+  name: string;
 
   @Cordova({ sync: true })
-  pingSync(): string {
-    return;
-  }
+  pingSync(): string { return; }
 
   @Cordova()
-  ping(): Promise<string> {
-    return;
-  }
+  ping(): Promise<string> { return; }
 
   @CordovaCheck()
   customPing(): Promise<string> {
@@ -63,17 +51,14 @@ class TestPlugin extends IonicNativePlugin {
   @Cordova({
     destruct: true
   })
-  destructPromise(): Promise<any> {
-    return;
-  }
+  destructPromise(): Promise<any> { return; }
 
   @Cordova({
     destruct: true,
     observable: true
   })
-  destructObservable(): Observable<any> {
-    return;
-  }
+  destructObservable(): Observable<any> { return; }
+
 }
 
 function definePlugin() {
@@ -93,6 +78,7 @@ function definePlugin() {
 }
 
 describe('Regular Decorators', () => {
+
   let plugin: TestPlugin;
 
   beforeEach(() => {
@@ -101,6 +87,7 @@ describe('Regular Decorators', () => {
   });
 
   describe('Plugin', () => {
+
     it('should set pluginName', () => {
       expect(TestPlugin.getPluginName()).toEqual('TestPlugin');
     });
@@ -116,16 +103,17 @@ describe('Regular Decorators', () => {
     it('should return supported platforms', () => {
       expect(TestPlugin.getSupportedPlatforms()).toEqual(['Android', 'iOS']);
     });
+
   });
 
   describe('Cordova', () => {
+
     it('should do a sync function', () => {
       expect(plugin.pingSync()).toEqual('pong');
     });
 
     it('should do an async function', (done: Function) => {
-      plugin
-        .ping()
+      plugin.ping()
         .then(res => {
           expect(res).toEqual('pong');
           done();
@@ -137,31 +125,39 @@ describe('Regular Decorators', () => {
     });
 
     it('should throw plugin_not_installed error', (done: Function) => {
+
       delete window.testPlugin;
       window.cordova = true;
 
       expect(<any>plugin.pingSync()).toEqual(ERR_PLUGIN_NOT_INSTALLED);
 
-      plugin.ping().catch(e => {
-        expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
-        delete window.cordova;
-        done();
-      });
+      plugin.ping()
+        .catch(e => {
+          expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
+          delete window.cordova;
+          done();
+        });
+
     });
 
     it('should throw cordova_not_available error', (done: Function) => {
+
       delete window.testPlugin;
 
       expect(<any>plugin.pingSync()).toEqual(ERR_CORDOVA_NOT_AVAILABLE);
 
-      plugin.ping().catch(e => {
-        expect(e).toEqual(ERR_CORDOVA_NOT_AVAILABLE.error);
-        done();
-      });
+      plugin.ping()
+        .catch(e => {
+          expect(e).toEqual(ERR_CORDOVA_NOT_AVAILABLE.error);
+          done();
+        });
+
     });
+
   });
 
   describe('CordovaProperty', () => {
+
     it('should return property value', () => {
       expect(plugin.name).toEqual('John Smith');
     });
@@ -170,47 +166,61 @@ describe('Regular Decorators', () => {
       plugin.name = 'value2';
       expect(plugin.name).toEqual('value2');
     });
+
   });
 
   describe('CordovaCheck', () => {
-    it('should run the method when plugin exists', done => {
-      plugin.customPing().then(res => {
-        expect(res).toEqual('pong');
-        done();
-      });
+
+    it('should run the method when plugin exists', (done) => {
+      plugin.customPing()
+        .then(res => {
+          expect(res).toEqual('pong');
+          done();
+        });
     });
 
-    it('shouldnt run the method when plugin doesnt exist', done => {
+    it('shouldnt run the method when plugin doesnt exist', (done) => {
       delete window.testPlugin;
       window.cordova = true;
-      plugin.customPing().catch(e => {
-        expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
-        done();
-      });
+      plugin.customPing()
+        .catch(e => {
+          expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
+          done();
+        });
     });
+
   });
 
   describe('CordovaOptions', () => {
+
     describe('destruct', () => {
-      it('should destruct values returned by a Promise', done => {
-        plugin.destructPromise().then((args: any[]) => {
-          expect(args).toEqual(['hello', 'world']);
-          done();
-        });
+
+      it('should destruct values returned by a Promise', (done) => {
+        plugin.destructPromise()
+          .then((args: any[]) => {
+            expect(args).toEqual(['hello', 'world']);
+            done();
+          });
       });
 
-      it('should destruct values returned by an Observable', done => {
-        plugin.destructObservable().subscribe((args: any[]) => {
-          expect(args).toEqual(['hello', 'world']);
-          done();
-        });
+      it('should destruct values returned by an Observable', (done) => {
+        plugin.destructObservable()
+          .subscribe((args: any[]) => {
+            expect(args).toEqual(['hello', 'world']);
+            done();
+          });
       });
+
     });
+
   });
+
 });
 
 describe('Instance Decorators', () => {
-  let instance: TestObject, plugin: TestPlugin;
+
+  let instance: TestObject,
+    plugin: TestPlugin;
 
   beforeEach(() => {
     definePlugin();
@@ -218,14 +228,20 @@ describe('Instance Decorators', () => {
     instance = plugin.create();
   });
 
-  describe('Instance plugin', () => {});
+  describe('Instance plugin', () => {
+
+
+
+  });
 
   describe('CordovaInstance', () => {
-    it('should call instance async method', done => {
-      instance.ping().then(r => {
-        expect(r).toEqual('pong');
-        done();
-      });
+
+    it('should call instance async method', (done) => {
+      instance.ping()
+        .then(r => {
+          expect(r).toEqual('pong');
+          done();
+        });
     });
 
     it('should call instance sync method', () => {
@@ -233,16 +249,18 @@ describe('Instance Decorators', () => {
     });
 
     it('shouldnt call instance method when _objectInstance is undefined', () => {
+
       delete instance._objectInstance;
-      instance
-        .ping()
+      instance.ping()
         .then(r => {
           expect(r).toBeUndefined();
         })
         .catch(e => {
           expect(e).toBeUndefined();
         });
+
     });
+
   });
 
   describe('InstanceProperty', () => {
@@ -255,4 +273,5 @@ describe('Instance Decorators', () => {
       expect(instance.name).toEqual('John Cena');
     });
   });
+
 });
diff --git a/src/@ionic-native/core/decorators.ts b/src/@ionic-native/core/decorators.ts
index d283aa3a3..0a99c3704 100644
--- a/src/@ionic-native/core/decorators.ts
+++ b/src/@ionic-native/core/decorators.ts
@@ -1,15 +1,7 @@
-import 'rxjs/observable/throw';
-
-import { Observable } from 'rxjs/Observable';
-
-import {
-  checkAvailability,
-  instanceAvailability,
-  overrideFunction,
-  wrap,
-  wrapInstance
-} from './plugin';
+import { instanceAvailability, checkAvailability, wrap, wrapInstance, overrideFunction } from './plugin';
 import { getPlugin, getPromise } from './util';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/observable/throw';
 
 export interface PluginConfig {
   /**
@@ -117,23 +109,21 @@ export interface CordovaCheckOptions {
  * @private
  */
 export function InstanceCheck(opts: CordovaCheckOptions = {}) {
-  return (
-    pluginObj: Object,
-    methodName: string,
-    descriptor: TypedPropertyDescriptor<any>
-  ): TypedPropertyDescriptor<any> => {
+  return (pluginObj: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> => {
     return {
       value: function(...args: any[]): any {
         if (instanceAvailability(this)) {
           return descriptor.value.apply(this, args);
         } else {
+
           if (opts.sync) {
             return;
           } else if (opts.observable) {
-            return new Observable<any>(() => {});
+            return new Observable<any>(() => { });
           }
 
-          return getPromise(() => {});
+          return getPromise(() => { });
+
         }
       },
       enumerable: true
@@ -146,11 +136,7 @@ export function InstanceCheck(opts: CordovaCheckOptions = {}) {
  * @private
  */
 export function CordovaCheck(opts: CordovaCheckOptions = {}) {
-  return (
-    pluginObj: Object,
-    methodName: string,
-    descriptor: TypedPropertyDescriptor<any>
-  ): TypedPropertyDescriptor<any> => {
+  return (pluginObj: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> => {
     return {
       value: function(...args: any[]): any {
         const check = checkAvailability(pluginObj);
@@ -191,6 +177,7 @@ export function CordovaCheck(opts: CordovaCheckOptions = {}) {
  */
 export function Plugin(config: PluginConfig): ClassDecorator {
   return function(cls: any) {
+
     // Add these fields to the class
     for (let prop in config) {
       cls[prop] = config[prop];
@@ -239,11 +226,7 @@ export function Plugin(config: PluginConfig): ClassDecorator {
  * and the required plugin are installed.
  */
 export function Cordova(opts: CordovaOptions = {}) {
-  return (
-    target: Object,
-    methodName: string,
-    descriptor: TypedPropertyDescriptor<any>
-  ) => {
+  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
     return {
       value: function(...args: any[]) {
         return wrap(this, methodName, opts).apply(this, args);
@@ -285,7 +268,7 @@ export function CordovaProperty(target: any, key: string) {
         return null;
       }
     },
-    set: value => {
+    set: (value) => {
       if (checkAvailability(target, key) === true) {
         getPlugin(target.constructor.getPluginRef())[key] = value;
       }
@@ -318,11 +301,7 @@ export function InstanceProperty(target: any, key: string) {
  * and the required plugin are installed.
  */
 export function CordovaFunctionOverride(opts: any = {}) {
-  return (
-    target: Object,
-    methodName: string,
-    descriptor: TypedPropertyDescriptor<any>
-  ) => {
+  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
     return {
       value: function(...args: any[]) {
         return overrideFunction(this, methodName, opts);
@@ -331,3 +310,4 @@ export function CordovaFunctionOverride(opts: any = {}) {
     };
   };
 }
+
diff --git a/src/@ionic-native/core/ionic-native-plugin.spec.ts b/src/@ionic-native/core/ionic-native-plugin.spec.ts
index 9837ffb1b..69df51ce8 100644
--- a/src/@ionic-native/core/ionic-native-plugin.spec.ts
+++ b/src/@ionic-native/core/ionic-native-plugin.spec.ts
@@ -1,7 +1,8 @@
 // This is to verify that new (FileTransfer.getPlugin)() works
-import { CordovaInstance, Plugin } from './decorators';
-import { IonicNativePlugin } from './ionic-native-plugin';
+
+import { Plugin, CordovaInstance } from './decorators';
 import { checkAvailability } from './plugin';
+import { IonicNativePlugin } from './ionic-native-plugin';
 
 class FT {
   hello(): string {
@@ -20,13 +21,7 @@ class FT {
 export class FileTransfer extends IonicNativePlugin {
   create(): FileTransferObject {
     let instance: any;
-    if (
-      checkAvailability(
-        FileTransfer.getPluginRef(),
-        null,
-        FileTransfer.getPluginName()
-      ) === true
-    ) {
+    if (checkAvailability(FileTransfer.getPluginRef(), null, FileTransfer.getPluginName()) === true) {
       instance = new (FileTransfer.getPlugin())();
     }
     return new FileTransferObject(instance);
@@ -34,21 +29,20 @@ export class FileTransfer extends IonicNativePlugin {
 }
 
 export class FileTransferObject {
+
   constructor(public _objectInstance: any) {
-    console.info(
-      'Creating a new FileTransferObject with instance: ',
-      _objectInstance
-    );
+    console.info('Creating a new FileTransferObject with instance: ', _objectInstance);
   }
 
   @CordovaInstance({ sync: true })
-  hello(): string {
-    return;
-  }
+  hello(): string { return; }
+
 }
 
 describe('Mock FileTransfer Plugin', () => {
-  let plugin: FileTransfer, instance: FileTransferObject;
+
+  let plugin: FileTransfer,
+    instance: FileTransferObject;
 
   beforeAll(() => {
     plugin = new FileTransfer();
@@ -71,4 +65,5 @@ describe('Mock FileTransfer Plugin', () => {
     console.info('instance hello is', instance.hello());
     expect(instance.hello()).toEqual('world');
   });
+
 });
diff --git a/src/@ionic-native/core/ionic-native-plugin.ts b/src/@ionic-native/core/ionic-native-plugin.ts
index f1660ae00..ed62979b3 100644
--- a/src/@ionic-native/core/ionic-native-plugin.ts
+++ b/src/@ionic-native/core/ionic-native-plugin.ts
@@ -1,4 +1,5 @@
 export class IonicNativePlugin {
+
   static pluginName: string;
 
   static pluginRef: string;
@@ -15,40 +16,31 @@ export class IonicNativePlugin {
    * Returns a boolean that indicates whether the plugin is installed
    * @return {boolean}
    */
-  static installed(): boolean {
-    return false;
-  }
+  static installed(): boolean { return false; }
 
   /**
    * Returns the original plugin object
    */
-  static getPlugin(): any {}
+  static getPlugin(): any { }
 
   /**
    * Returns the plugin's name
    */
-  static getPluginName(): string {
-    return;
-  }
+  static getPluginName(): string { return; }
 
   /**
    * Returns the plugin's reference
    */
-  static getPluginRef(): string {
-    return;
-  }
+  static getPluginRef(): string { return; }
 
   /**
    * Returns the plugin's install name
    */
-  static getPluginInstallName(): string {
-    return;
-  }
+  static getPluginInstallName(): string { return; }
 
   /**
    * Returns the plugin's supported platforms
    */
-  static getSupportedPlatforms(): string[] {
-    return;
-  }
+  static getSupportedPlatforms(): string[] { return; }
+
 }
diff --git a/src/@ionic-native/core/plugin.ts b/src/@ionic-native/core/plugin.ts
index a86429100..4118e482e 100644
--- a/src/@ionic-native/core/plugin.ts
+++ b/src/@ionic-native/core/plugin.ts
@@ -1,10 +1,9 @@
-import 'rxjs/add/observable/fromEvent';
-
-import { Observable } from 'rxjs/Observable';
-
+import { getPlugin, getPromise, cordovaWarn, pluginWarn } from './util';
 import { checkReady } from './bootstrap';
 import { CordovaOptions } from './decorators';
-import { cordovaWarn, getPlugin, getPromise, pluginWarn } from './util';
+
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromEvent';
 
 checkReady();
 
@@ -14,26 +13,16 @@ checkReady();
 export const ERR_CORDOVA_NOT_AVAILABLE = { error: 'cordova_not_available' };
 export const ERR_PLUGIN_NOT_INSTALLED = { error: 'plugin_not_installed' };
 
+
 /**
  * Checks if plugin/cordova is available
  * @return {boolean | { error: string } }
  * @private
  */
-export function checkAvailability(
-  pluginRef: string,
-  methodName?: string,
-  pluginName?: string
-): boolean | { error: string };
-export function checkAvailability(
-  pluginObj: any,
-  methodName?: string,
-  pluginName?: string
-): boolean | { error: string };
-export function checkAvailability(
-  plugin: any,
-  methodName?: string,
-  pluginName?: string
-): boolean | { error: string } {
+export function checkAvailability(pluginRef: string, methodName?: string, pluginName?: string): boolean | { error: string };
+export function checkAvailability(pluginObj: any, methodName?: string, pluginName?: string): boolean | { error: string };
+export function checkAvailability(plugin: any, methodName?: string, pluginName?: string): boolean | { error: string } {
+
   let pluginRef, pluginInstance, pluginPackage;
 
   if (typeof plugin === 'string') {
@@ -46,10 +35,7 @@ export function checkAvailability(
 
   pluginInstance = getPlugin(pluginRef);
 
-  if (
-    !pluginInstance ||
-    (!!methodName && typeof pluginInstance[methodName] === 'undefined')
-  ) {
+  if (!pluginInstance || (!!methodName && typeof pluginInstance[methodName] === 'undefined')) {
     if (!window.cordova) {
       cordovaWarn(pluginName, methodName);
       return ERR_CORDOVA_NOT_AVAILABLE;
@@ -66,23 +52,11 @@ export function checkAvailability(
  * Checks if _objectInstance exists and has the method/property
  * @private
  */
-export function instanceAvailability(
-  pluginObj: any,
-  methodName?: string
-): boolean {
-  return (
-    pluginObj._objectInstance &&
-    (!methodName ||
-      typeof pluginObj._objectInstance[methodName] !== 'undefined')
-  );
+export function instanceAvailability(pluginObj: any, methodName?: string): boolean {
+  return pluginObj._objectInstance && (!methodName || typeof pluginObj._objectInstance[methodName] !== 'undefined');
 }
 
-function setIndex(
-  args: any[],
-  opts: any = {},
-  resolve?: Function,
-  reject?: Function
-): any {
+function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Function): any {
   // ignore resolve and reject in case sync
   if (opts.sync) {
     return args;
@@ -101,19 +75,12 @@ function setIndex(
         resolve(result);
       }
     });
-  } else if (
-    opts.callbackStyle === 'object' &&
-    opts.successName &&
-    opts.errorName
-  ) {
+  } else if (opts.callbackStyle === 'object' && opts.successName && opts.errorName) {
     let obj: any = {};
     obj[opts.successName] = resolve;
     obj[opts.errorName] = reject;
     args.push(obj);
-  } else if (
-    typeof opts.successIndex !== 'undefined' ||
-    typeof opts.errorIndex !== 'undefined'
-  ) {
+  } else if (typeof opts.successIndex !== 'undefined' || typeof opts.errorIndex !== 'undefined') {
     const setSuccessIndex = () => {
       // If we've specified a success/error index
       if (opts.successIndex > args.length) {
@@ -139,6 +106,8 @@ function setIndex(
       setSuccessIndex();
       setErrorIndex();
     }
+
+
   } else {
     // Otherwise, let's tack them on to the end of the argument list
     // which is 90% of cases
@@ -148,14 +117,7 @@ function setIndex(
   return args;
 }
 
-function callCordovaPlugin(
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {},
-  resolve?: Function,
-  reject?: Function
-) {
+function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts: any = {}, resolve?: Function, reject?: Function) {
   // Try to figure out where the success/error callbacks need to be bound
   // to our promise resolve/reject handlers.
   args = setIndex(args, opts, resolve, reject);
@@ -168,34 +130,16 @@ function callCordovaPlugin(
   } else {
     return availabilityCheck;
   }
+
 }
 
-function wrapPromise(
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {}
-) {
+function wrapPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
   let pluginResult: any, rej: Function;
   const p = getPromise((resolve: Function, reject: Function) => {
     if (opts.destruct) {
-      pluginResult = callCordovaPlugin(
-        pluginObj,
-        methodName,
-        args,
-        opts,
-        (...args: any[]) => resolve(args),
-        (...args: any[]) => reject(args)
-      );
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
     } else {
-      pluginResult = callCordovaPlugin(
-        pluginObj,
-        methodName,
-        args,
-        opts,
-        resolve,
-        reject
-      );
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, resolve, reject);
     }
     rej = reject;
   });
@@ -203,18 +147,13 @@ function wrapPromise(
   // a warning that Cordova is undefined or the plugin is uninstalled, so there is no reason
   // to error
   if (pluginResult && pluginResult.error) {
-    p.catch(() => {});
+    p.catch(() => { });
     typeof rej === 'function' && rej(pluginResult.error);
   }
   return p;
 }
 
-function wrapOtherPromise(
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {}
-) {
+function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
   return getPromise((resolve: Function, reject: Function) => {
     const pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts);
     if (pluginResult) {
@@ -229,33 +168,14 @@ function wrapOtherPromise(
   });
 }
 
-function wrapObservable(
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {}
-) {
+function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
   return new Observable(observer => {
     let pluginResult;
 
     if (opts.destruct) {
-      pluginResult = callCordovaPlugin(
-        pluginObj,
-        methodName,
-        args,
-        opts,
-        (...args: any[]) => observer.next(args),
-        (...args: any[]) => observer.error(args)
-      );
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, (...args: any[]) => observer.next(args), (...args: any[]) => observer.error(args));
     } else {
-      pluginResult = callCordovaPlugin(
-        pluginObj,
-        methodName,
-        args,
-        opts,
-        observer.next.bind(observer),
-        observer.error.bind(observer)
-      );
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
     }
 
     if (pluginResult && pluginResult.error) {
@@ -266,45 +186,26 @@ function wrapObservable(
       try {
         if (opts.clearFunction) {
           if (opts.clearWithArgs) {
-            return callCordovaPlugin(
-              pluginObj,
-              opts.clearFunction,
-              args,
-              opts,
-              observer.next.bind(observer),
-              observer.error.bind(observer)
-            );
+            return callCordovaPlugin(pluginObj, opts.clearFunction, args, opts, observer.next.bind(observer), observer.error.bind(observer));
           }
           return callCordovaPlugin(pluginObj, opts.clearFunction, []);
         }
       } catch (e) {
-        console.warn(
-          'Unable to clear the previous observable watch for',
-          pluginObj.constructor.getPluginName(),
-          methodName
-        );
+        console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
         console.warn(e);
       }
     };
   });
 }
 
-function callInstance(
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {},
-  resolve?: Function,
-  reject?: Function
-) {
+function callInstance(pluginObj: any, methodName: string, args: any[], opts: any = {}, resolve?: Function, reject?: Function) {
+
   args = setIndex(args, opts, resolve, reject);
 
   if (instanceAvailability(pluginObj, methodName)) {
-    return pluginObj._objectInstance[methodName].apply(
-      pluginObj._objectInstance,
-      args
-    );
+    return pluginObj._objectInstance[methodName].apply(pluginObj._objectInstance, args);
   }
+
 }
 
 /**
@@ -314,10 +215,7 @@ function callInstance(
  * @param element The element to attach the event listener to
  * @returns {Observable}
  */
-export function wrapEventObservable(
-  event: string,
-  element: any = window
-): Observable<any> {
+export function wrapEventObservable(event: string, element: any = window): Observable<any> {
   return Observable.fromEvent(element, event);
 }
 
@@ -329,38 +227,28 @@ export function wrapEventObservable(
  * does just this.
  * @private
  */
-export function overrideFunction(
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {}
-): Observable<any> {
+export function overrideFunction(pluginObj: any, methodName: string, args: any[], opts: any = {}): Observable<any> {
   return new Observable(observer => {
-    const availabilityCheck = checkAvailability(
-      pluginObj,
-      null,
-      pluginObj.constructor.getPluginName()
-    );
+
+    const availabilityCheck = checkAvailability(pluginObj, null, pluginObj.constructor.getPluginName());
 
     if (availabilityCheck === true) {
       const pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());
       pluginInstance[methodName] = observer.next.bind(observer);
-      return () => (pluginInstance[methodName] = () => {});
+      return () => pluginInstance[methodName] = () => { };
     } else {
       observer.error(availabilityCheck);
       observer.complete();
     }
+
   });
 }
 
+
 /**
  * @private
  */
-export const wrap = function(
-  pluginObj: any,
-  methodName: string,
-  opts: CordovaOptions = {}
-) {
+export const wrap = function(pluginObj: any, methodName: string, opts: CordovaOptions = {}) {
   return (...args: any[]) => {
     if (opts.sync) {
       // Sync doesn't wrap the plugin with a promise or observable, it returns the result as-is
@@ -380,36 +268,22 @@ export const wrap = function(
 /**
  * @private
  */
-export function wrapInstance(
-  pluginObj: any,
-  methodName: string,
-  opts: any = {}
-) {
+export function wrapInstance(pluginObj: any, methodName: string, opts: any = {}) {
   return (...args: any[]) => {
     if (opts.sync) {
+
       return callInstance(pluginObj, methodName, args, opts);
+
     } else if (opts.observable) {
+
       return new Observable(observer => {
+
         let pluginResult;
 
         if (opts.destruct) {
-          pluginResult = callInstance(
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            (...args: any[]) => observer.next(args),
-            (...args: any[]) => observer.error(args)
-          );
+          pluginResult = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => observer.next(args), (...args: any[]) => observer.error(args));
         } else {
-          pluginResult = callInstance(
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            observer.next.bind(observer),
-            observer.error.bind(observer)
-          );
+          pluginResult = callInstance(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
         }
 
         if (pluginResult && pluginResult.error) {
@@ -420,47 +294,23 @@ export function wrapInstance(
         return () => {
           try {
             if (opts.clearWithArgs) {
-              return callInstance(
-                pluginObj,
-                opts.clearFunction,
-                args,
-                opts,
-                observer.next.bind(observer),
-                observer.error.bind(observer)
-              );
+              return callInstance(pluginObj, opts.clearFunction, args, opts, observer.next.bind(observer), observer.error.bind(observer));
             }
             return callInstance(pluginObj, opts.clearFunction, []);
           } catch (e) {
-            console.warn(
-              'Unable to clear the previous observable watch for',
-              pluginObj.constructor.getPluginName(),
-              methodName
-            );
+            console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
             console.warn(e);
           }
         };
       });
+
     } else if (opts.otherPromise) {
       return getPromise((resolve: Function, reject: Function) => {
         let result;
         if (opts.destruct) {
-          result = callInstance(
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            (...args: any[]) => resolve(args),
-            (...args: any[]) => reject(args)
-          );
+          result = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
         } else {
-          result = callInstance(
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            resolve,
-            reject
-          );
+          result = callInstance(pluginObj, methodName, args, opts, resolve, reject);
         }
         if (result && !!result.then) {
           result.then(resolve, reject);
@@ -468,27 +318,14 @@ export function wrapInstance(
           reject();
         }
       });
+
     } else {
       let pluginResult: any, rej: Function;
       const p = getPromise((resolve: Function, reject: Function) => {
         if (opts.destruct) {
-          pluginResult = callInstance(
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            (...args: any[]) => resolve(args),
-            (...args: any[]) => reject(args)
-          );
+          pluginResult = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
         } else {
-          pluginResult = callInstance(
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            resolve,
-            reject
-          );
+          pluginResult = callInstance(pluginObj, methodName, args, opts, resolve, reject);
         }
         rej = reject;
       });
@@ -496,10 +333,12 @@ export function wrapInstance(
       // a warning that Cordova is undefined or the plugin is uninstalled, so there is no reason
       // to error
       if (pluginResult && pluginResult.error) {
-        p.catch(() => {});
+        p.catch(() => { });
         typeof rej === 'function' && rej(pluginResult.error);
       }
       return p;
+
+
     }
   };
 }
diff --git a/src/@ionic-native/core/util.ts b/src/@ionic-native/core/util.ts
index 93d6754b7..eddedaaaa 100644
--- a/src/@ionic-native/core/util.ts
+++ b/src/@ionic-native/core/util.ts
@@ -7,27 +7,25 @@ export const get = (element: Element | Window, path: string): any => {
   const paths: string[] = path.split('.');
   let obj: any = element;
   for (let i: number = 0; i < paths.length; i++) {
-    if (!obj) {
-      return null;
-    }
+    if (!obj) { return null; }
     obj = obj[paths[i]];
   }
   return obj;
 };
 
+
 /**
  * @private
  */
 export const getPromise = (callback: Function): Promise<any> => {
+
   const tryNativePromise = () => {
     if (window.Promise) {
       return new Promise((resolve, reject) => {
         callback(resolve, reject);
       });
     } else {
-      console.error(
-        'No Promise support or polyfill found. To enable Ionic Native support, please add the es6-promise polyfill before this script, or run with a library like Angular or on a recent browser.'
-      );
+      console.error('No Promise support or polyfill found. To enable Ionic Native support, please add the es6-promise polyfill before this script, or run with a library like Angular or on a recent browser.');
     }
   };
 
@@ -46,24 +44,14 @@ export const getPlugin = (pluginRef: string): any => {
 /**
  * @private
  */
-export const pluginWarn = (
-  pluginName: string,
-  plugin?: string,
-  method?: string
-): void => {
+export const pluginWarn = (pluginName: string, plugin?: string, method?: string): void => {
   if (method) {
-    console.warn(
-      `Native: tried calling ${pluginName}.${method}, but the ${pluginName} plugin is not installed.`
-    );
+    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but the ' + pluginName + ' plugin is not installed.');
   } else {
-    console.warn(
-      `Native: tried accessing the ${pluginName} plugin but it's not installed.`
-    );
+    console.warn('Native: tried accessing the ' + pluginName + ' plugin but it\'s not installed.');
   }
   if (plugin) {
-    console.warn(
-      `Install the ${pluginName} plugin: 'ionic cordova plugin add ${plugin}'`
-    );
+    console.warn('Install the ' + pluginName + ' plugin: \'ionic cordova plugin add ' + plugin + '\'');
   }
 };
 
@@ -74,12 +62,8 @@ export const pluginWarn = (
  */
 export const cordovaWarn = (pluginName: string, method?: string): void => {
   if (method) {
-    console.warn(
-      `Native: tried calling ${pluginName}.${method}, but Cordova is not available. Make sure to include cordova.js or run in a device/simulator`
-    );
+    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
   } else {
-    console.warn(
-      `Native: tried accessing the ${pluginName} plugin but Cordova is not available. Make sure to include cordova.js or run in a device/simulator`
-    );
+    console.warn('Native: tried accessing the ' + pluginName + ' plugin but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
   }
 };
diff --git a/src/@ionic-native/plugins/action-sheet/index.ts b/src/@ionic-native/plugins/action-sheet/index.ts
index ece9808c0..5273f8d0c 100644
--- a/src/@ionic-native/plugins/action-sheet/index.ts
+++ b/src/@ionic-native/plugins/action-sheet/index.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface ActionSheetOptions {
+
   /**
    * The labels for the buttons. Uses the index x
    */
@@ -97,6 +98,7 @@ export interface ActionSheetOptions {
 })
 @Injectable()
 export class ActionSheet extends IonicNativePlugin {
+
   /**
    * Convenience property to select an Android theme value
    */
@@ -121,16 +123,13 @@ export class ActionSheet extends IonicNativePlugin {
    *   button pressed (1 based, so 1, 2, 3, etc.)
    */
   @Cordova()
-  show(options?: ActionSheetOptions): Promise<number> {
-    return;
-  }
+  show(options?: ActionSheetOptions): Promise<number> { return; }
+
 
   /**
    * Progamtically hide the native ActionSheet
    * @returns {Promise<any>} Returns a Promise that resolves when the actionsheet is closed
    */
   @Cordova()
-  hide(options?: any): Promise<any> {
-    return;
-  }
+  hide(options?: any): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/admob-free/index.ts b/src/@ionic-native/plugins/admob-free/index.ts
index 8df51ec5e..bcd059b3d 100644
--- a/src/@ionic-native/plugins/admob-free/index.ts
+++ b/src/@ionic-native/plugins/admob-free/index.ts
@@ -1,8 +1,7 @@
-import 'rxjs/add/observable/fromEvent';
-
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromEvent';
 
 export interface AdMobFreeBannerConfig {
   /**
@@ -115,6 +114,7 @@ export interface AdMobFreeRewardVideoConfig {
 })
 @Injectable()
 export class AdMobFree extends IonicNativePlugin {
+
   /**
    * Convenience object to get event names
    * @type {Object}
@@ -167,6 +167,7 @@ export class AdMobFree extends IonicNativePlugin {
    * @type {AdMobFreeRewardVideo}
    */
   rewardVideo: AdMobFreeRewardVideo = new AdMobFreeRewardVideo();
+
 }
 
 /**
@@ -175,54 +176,46 @@ export class AdMobFree extends IonicNativePlugin {
 @Plugin({
   pluginName: 'AdMobFree',
   plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.banner'
+  pluginRef: 'admob.banner',
 })
 export class AdMobFreeBanner {
+
   /**
    * Update config.
    * @param options
    * @return {AdMobFreeBannerConfig}
    */
   @Cordova({ sync: true })
-  config(options: AdMobFreeBannerConfig): AdMobFreeBannerConfig {
-    return;
-  }
+  config(options: AdMobFreeBannerConfig): AdMobFreeBannerConfig { return; }
 
   /**
    * Hide the banner.
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  hide(): Promise<any> {
-    return;
-  }
+  hide(): Promise<any> { return; }
 
   /**
    * Create banner.
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  prepare(): Promise<any> {
-    return;
-  }
+  prepare(): Promise<any> { return; }
 
   /**
    * Remove the banner.
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  remove(): Promise<any> {
-    return;
-  }
+  remove(): Promise<any> { return; }
 
   /**
    * Show the banner.
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  show(): Promise<any> {
-    return;
-  }
+  show(): Promise<any> { return; }
+
 }
 
 /**
@@ -231,45 +224,39 @@ export class AdMobFreeBanner {
 @Plugin({
   pluginName: 'AdMobFree',
   plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.interstitial'
+  pluginRef: 'admob.interstitial',
 })
 export class AdMobFreeInterstitial {
+
   /**
    * Update config.
    * @param options
    * @return {AdMobFreeInterstitialConfig}
    */
   @Cordova({ sync: true })
-  config(options: AdMobFreeInterstitialConfig): AdMobFreeInterstitialConfig {
-    return;
-  }
+  config(options: AdMobFreeInterstitialConfig): AdMobFreeInterstitialConfig { return; }
 
   /**
    * Check if interstitial is ready
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  isReady(): Promise<any> {
-    return;
-  }
+  isReady(): Promise<any> { return; }
 
   /**
    * Prepare interstitial
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  prepare(): Promise<any> {
-    return;
-  }
+  prepare(): Promise<any> { return; }
 
   /**
    * Show the interstitial
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  show(): Promise<any> {
-    return;
-  }
+  show(): Promise<any> { return; }
+
 }
 
 /**
@@ -278,43 +265,37 @@ export class AdMobFreeInterstitial {
 @Plugin({
   pluginName: 'AdMobFree',
   plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.rewardvideo'
+  pluginRef: 'admob.rewardvideo',
 })
 export class AdMobFreeRewardVideo {
+
   /**
    * Update config.
    * @param options
    * @return {AdMobFreeRewardVideoConfig}
    */
   @Cordova({ sync: true })
-  config(options: AdMobFreeRewardVideoConfig): AdMobFreeRewardVideoConfig {
-    return;
-  }
+  config(options: AdMobFreeRewardVideoConfig): AdMobFreeRewardVideoConfig { return; }
 
   /**
    * Check if reward video is ready
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  isReady(): Promise<any> {
-    return;
-  }
+  isReady(): Promise<any> { return; }
 
   /**
    * Prepare reward video
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  prepare(): Promise<any> {
-    return;
-  }
+  prepare(): Promise<any> { return; }
 
   /**
    * Show the reward video
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  show(): Promise<any> {
-    return;
-  }
+  show(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/admob-pro/index.ts b/src/@ionic-native/plugins/admob-pro/index.ts
index 450e7b5f6..ad9c66b1d 100644
--- a/src/@ionic-native/plugins/admob-pro/index.ts
+++ b/src/@ionic-native/plugins/admob-pro/index.ts
@@ -1,17 +1,11 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
-export type AdSize =
-  | 'SMART_BANNER'
-  | 'BANNER'
-  | 'MEDIUM_RECTANGLE'
-  | 'FULL_BANNER'
-  | 'LEADERBOARD'
-  | 'SKYSCRAPER'
-  | 'CUSTOM';
+export type AdSize = 'SMART_BANNER' | 'BANNER' | 'MEDIUM_RECTANGLE' | 'FULL_BANNER' | 'LEADERBOARD' | 'SKYSCRAPER' | 'CUSTOM';
 
 export interface AdMobOptions {
+
   /**
    * Banner ad ID
    */
@@ -76,9 +70,11 @@ export interface AdMobOptions {
    * License key for the plugin
    */
   license?: any;
+
 }
 
 export interface AdExtras {
+
   color_bg: string;
 
   color_bg_top: string;
@@ -90,6 +86,7 @@ export interface AdExtras {
   color_text: string;
 
   color_url: string;
+
 }
 
 /**
@@ -137,6 +134,7 @@ export interface AdExtras {
 })
 @Injectable()
 export class AdMobPro extends IonicNativePlugin {
+
   AD_POSITION: {
     NO_CHANGE: number;
     TOP_LEFT: number;
@@ -169,9 +167,7 @@ export class AdMobPro extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves when the banner is created
    */
   @Cordova()
-  createBanner(adIdOrOptions: string | AdMobOptions): Promise<any> {
-    return;
-  }
+  createBanner(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }
 
   /**
    * Destroy the banner, remove it from screen.
@@ -179,7 +175,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  removeBanner(): void {}
+  removeBanner(): void { }
 
   /**
    * Show banner at position
@@ -188,7 +184,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  showBanner(position: number): void {}
+  showBanner(position: number): void { }
 
   /**
    * Show banner at custom position
@@ -198,7 +194,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  showBannerAtXY(x: number, y: number): void {}
+  showBannerAtXY(x: number, y: number): void { }
 
   /**
    * Hide the banner, remove it from screen, but can show it later
@@ -206,7 +202,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  hideBanner(): void {}
+  hideBanner(): void { }
 
   /**
    * Prepare interstitial banner
@@ -214,9 +210,7 @@ export class AdMobPro extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves when interstitial is prepared
    */
   @Cordova()
-  prepareInterstitial(adIdOrOptions: string | AdMobOptions): Promise<any> {
-    return;
-  }
+  prepareInterstitial(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }
 
   /**
    * Show interstitial ad when it's ready
@@ -224,7 +218,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  showInterstitial(): void {}
+  showInterstitial(): void { }
 
   /**
    * Prepare a reward video ad
@@ -232,9 +226,7 @@ export class AdMobPro extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves when the ad is prepared
    */
   @Cordova()
-  prepareRewardVideoAd(adIdOrOptions: string | AdMobOptions): Promise<any> {
-    return;
-  }
+  prepareRewardVideoAd(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }
 
   /**
    * Show a reward video ad
@@ -242,7 +234,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  showRewardVideoAd(): void {}
+  showRewardVideoAd(): void { }
 
   /**
    * Sets the values for configuration and targeting
@@ -250,18 +242,14 @@ export class AdMobPro extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves when the options have been set
    */
   @Cordova()
-  setOptions(options: AdMobOptions): Promise<any> {
-    return;
-  }
+  setOptions(options: AdMobOptions): Promise<any> { return; }
 
   /**
    * Get user ad settings
    * @returns {Promise<any>} Returns a promise that resolves with the ad settings
    */
   @Cordova()
-  getAdSettings(): Promise<any> {
-    return;
-  }
+  getAdSettings(): Promise<any> { return; }
 
   /**
    * Triggered when failed to receive Ad
@@ -272,9 +260,7 @@ export class AdMobPro extends IonicNativePlugin {
     event: 'onAdFailLoad',
     element: document
   })
-  onAdFailLoad(): Observable<any> {
-    return;
-  }
+  onAdFailLoad(): Observable<any> { return; }
 
   /**
    * Triggered when Ad received
@@ -285,9 +271,7 @@ export class AdMobPro extends IonicNativePlugin {
     event: 'onAdLoaded',
     element: document
   })
-  onAdLoaded(): Observable<any> {
-    return;
-  }
+  onAdLoaded(): Observable<any> { return; }
 
   /**
    * Triggered when Ad will be showed on screen
@@ -298,9 +282,7 @@ export class AdMobPro extends IonicNativePlugin {
     event: 'onAdPresent',
     element: document
   })
-  onAdPresent(): Observable<any> {
-    return;
-  }
+  onAdPresent(): Observable<any> { return; }
 
   /**
    * Triggered when user click the Ad, and will jump out of your App
@@ -311,9 +293,7 @@ export class AdMobPro extends IonicNativePlugin {
     event: 'onAdLeaveApp',
     element: document
   })
-  onAdLeaveApp(): Observable<any> {
-    return;
-  }
+  onAdLeaveApp(): Observable<any> { return; }
 
   /**
    * Triggered when dismiss the Ad and back to your App
@@ -324,7 +304,6 @@ export class AdMobPro extends IonicNativePlugin {
     event: 'onAdDismiss',
     element: document
   })
-  onAdDismiss(): Observable<any> {
-    return;
-  }
+  onAdDismiss(): Observable<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/alipay/index.ts b/src/@ionic-native/plugins/alipay/index.ts
index f44f6c1ed..c0e517e61 100644
--- a/src/@ionic-native/plugins/alipay/index.ts
+++ b/src/@ionic-native/plugins/alipay/index.ts
@@ -1,5 +1,7 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+
 
 export interface AlipayOrder {
   /**
@@ -99,8 +101,7 @@ export interface AlipayOrder {
   plugin: 'cordova-alipay-base',
   pluginRef: 'Alipay.Base',
   repo: 'https://github.com/xueron/cordova-alipay-base',
-  install:
-    'ionic cordova plugin add cordova-alipay-base --variable ALI_PID=your_app_id',
+  install: 'ionic cordova plugin add cordova-alipay-base --variable ALI_PID=your_app_id',
   installVariables: ['ALI_PID'],
   platforms: ['Android', 'iOS']
 })
@@ -112,7 +113,5 @@ export class Alipay extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the success return, or rejects with an error.
    */
   @Cordova()
-  pay(order: AlipayOrder | string): Promise<any> {
-    return;
-  }
+  pay(order: AlipayOrder | string): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/android-exoplayer/index.ts b/src/@ionic-native/plugins/android-exoplayer/index.ts
index 53f751098..26fe48831 100644
--- a/src/@ionic-native/plugins/android-exoplayer/index.ts
+++ b/src/@ionic-native/plugins/android-exoplayer/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export type AndroidExoPlayerAspectRatio = 'FILL_SCREEN' | 'FIT_SCREEN';
@@ -187,16 +187,14 @@ export class AndroidExoplayer extends IonicNativePlugin {
    * @param parameters {AndroidExoPlayerParams} Parameters
    * @return {Observable<AndroidExoplayerState>}
    */
-  @Cordova({
-    observable: true,
-    clearFunction: 'close',
-    clearWithArgs: false,
-    successIndex: 1,
-    errorIndex: 2
-  })
-  show(parameters: AndroidExoPlayerParams): Observable<AndroidExoplayerState> {
-    return;
-  }
+   @Cordova({
+     observable: true,
+     clearFunction: 'close',
+     clearWithArgs: false,
+     successIndex: 1,
+     errorIndex: 2
+   })
+  show(parameters: AndroidExoPlayerParams): Observable<AndroidExoplayerState> { return; }
 
   /**
    * Switch stream without disposing of the player.
@@ -205,30 +203,21 @@ export class AndroidExoplayer extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  setStream(
-    url: string,
-    controller: AndroidExoPlayerControllerConfig
-  ): Promise<void> {
-    return;
-  }
+  setStream(url: string, controller: AndroidExoPlayerControllerConfig): Promise<void> { return; }
 
   /**
    * Will pause if playing and play if paused
    * @return {Promise<void>}
    */
   @Cordova()
-  playPause(): Promise<void> {
-    return;
-  }
+  playPause(): Promise<void> { return; }
 
   /**
    * Stop playing.
    * @return {Promise<void>}
    */
   @Cordova()
-  stop(): Promise<void> {
-    return;
-  }
+  stop(): Promise<void> { return; }
 
   /**
    * Jump to a particular position.
@@ -236,9 +225,7 @@ export class AndroidExoplayer extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  seekTo(milliseconds: number): Promise<void> {
-    return;
-  }
+  seekTo(milliseconds: number): Promise<void> { return; }
 
   /**
    * Jump to a particular time relative to the current position.
@@ -246,36 +233,28 @@ export class AndroidExoplayer extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  seekBy(milliseconds: number): Promise<void> {
-    return;
-  }
+  seekBy(milliseconds: number): Promise<void> { return; }
 
   /**
    * Get the current player state.
    * @return {Promise<AndroidExoplayerState>}
    */
   @Cordova()
-  getState(): Promise<AndroidExoplayerState> {
-    return;
-  }
+  getState(): Promise<AndroidExoplayerState> { return; }
 
   /**
    * Show the controller.
    * @return {Promise<void>}
    */
   @Cordova()
-  showController(): Promise<void> {
-    return;
-  }
+  showController(): Promise<void> { return; }
 
   /**
    * Hide the controller.
    * @return {Promise<void>}
    */
   @Cordova()
-  hideController(): Promise<void> {
-    return;
-  }
+  hideController(): Promise<void> { return; }
 
   /**
    * Update the controller configuration.
@@ -283,16 +262,12 @@ export class AndroidExoplayer extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  setController(controller: AndroidExoPlayerControllerConfig): Promise<void> {
-    return;
-  }
+  setController(controller: AndroidExoPlayerControllerConfig): Promise<void> { return; }
 
   /**
    * Close and dispose of player, call before destroy.
    * @return {Promise<void>}
    */
   @Cordova()
-  close(): Promise<void> {
-    return;
-  }
+  close(): Promise<void> { return; }
 }
diff --git a/src/@ionic-native/plugins/android-fingerprint-auth/index.ts b/src/@ionic-native/plugins/android-fingerprint-auth/index.ts
index 3044bd855..2366e86bb 100644
--- a/src/@ionic-native/plugins/android-fingerprint-auth/index.ts
+++ b/src/@ionic-native/plugins/android-fingerprint-auth/index.ts
@@ -1,7 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 export interface AFAAuthOptions {
+
   /**
    * Required
    * Used as the alias for your key in the Android Key Store.
@@ -60,6 +62,7 @@ export interface AFAAuthOptions {
    * Set the hint displayed by the fingerprint icon on the fingerprint authentication dialog.
    */
   dialogHint?: string;
+
 }
 
 export interface AFADecryptOptions {
@@ -146,25 +149,26 @@ export interface AFAEncryptResponse {
 })
 @Injectable()
 export class AndroidFingerprintAuth extends IonicNativePlugin {
+
   ERRORS: {
-    BAD_PADDING_EXCEPTION: 'BAD_PADDING_EXCEPTION';
-    CERTIFICATE_EXCEPTION: 'CERTIFICATE_EXCEPTION';
-    FINGERPRINT_CANCELLED: 'FINGERPRINT_CANCELLED';
-    FINGERPRINT_DATA_NOT_DELETED: 'FINGERPRINT_DATA_NOT_DELETED';
-    FINGERPRINT_ERROR: 'FINGERPRINT_ERROR';
-    FINGERPRINT_NOT_AVAILABLE: 'FINGERPRINT_NOT_AVAILABLE';
-    FINGERPRINT_PERMISSION_DENIED: 'FINGERPRINT_PERMISSION_DENIED';
-    FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST: 'FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST';
-    ILLEGAL_BLOCK_SIZE_EXCEPTION: 'ILLEGAL_BLOCK_SIZE_EXCEPTION';
-    INIT_CIPHER_FAILED: 'INIT_CIPHER_FAILED';
-    INVALID_ALGORITHM_PARAMETER_EXCEPTION: 'INVALID_ALGORITHM_PARAMETER_EXCEPTION';
-    IO_EXCEPTION: 'IO_EXCEPTION';
-    JSON_EXCEPTION: 'JSON_EXCEPTION';
-    MINIMUM_SDK: 'MINIMUM_SDK';
-    MISSING_ACTION_PARAMETERS: 'MISSING_ACTION_PARAMETERS';
-    MISSING_PARAMETERS: 'MISSING_PARAMETERS';
-    NO_SUCH_ALGORITHM_EXCEPTION: 'NO_SUCH_ALGORITHM_EXCEPTION';
-    SECURITY_EXCEPTION: 'SECURITY_EXCEPTION';
+    BAD_PADDING_EXCEPTION: 'BAD_PADDING_EXCEPTION',
+    CERTIFICATE_EXCEPTION: 'CERTIFICATE_EXCEPTION',
+    FINGERPRINT_CANCELLED: 'FINGERPRINT_CANCELLED',
+    FINGERPRINT_DATA_NOT_DELETED: 'FINGERPRINT_DATA_NOT_DELETED',
+    FINGERPRINT_ERROR: 'FINGERPRINT_ERROR',
+    FINGERPRINT_NOT_AVAILABLE: 'FINGERPRINT_NOT_AVAILABLE',
+    FINGERPRINT_PERMISSION_DENIED: 'FINGERPRINT_PERMISSION_DENIED',
+    FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST: 'FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST',
+    ILLEGAL_BLOCK_SIZE_EXCEPTION: 'ILLEGAL_BLOCK_SIZE_EXCEPTION',
+    INIT_CIPHER_FAILED: 'INIT_CIPHER_FAILED',
+    INVALID_ALGORITHM_PARAMETER_EXCEPTION: 'INVALID_ALGORITHM_PARAMETER_EXCEPTION',
+    IO_EXCEPTION: 'IO_EXCEPTION',
+    JSON_EXCEPTION: 'JSON_EXCEPTION',
+    MINIMUM_SDK: 'MINIMUM_SDK',
+    MISSING_ACTION_PARAMETERS: 'MISSING_ACTION_PARAMETERS',
+    MISSING_PARAMETERS: 'MISSING_PARAMETERS',
+    NO_SUCH_ALGORITHM_EXCEPTION: 'NO_SUCH_ALGORITHM_EXCEPTION',
+    SECURITY_EXCEPTION: 'SECURITY_EXCEPTION'
   };
 
   /**
@@ -173,9 +177,7 @@ export class AndroidFingerprintAuth extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  encrypt(options: AFAAuthOptions): Promise<AFAEncryptResponse> {
-    return;
-  }
+  encrypt(options: AFAAuthOptions): Promise<AFAEncryptResponse> { return; }
 
   /**
    * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
@@ -183,32 +185,19 @@ export class AndroidFingerprintAuth extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  decrypt(options: AFAAuthOptions): Promise<AFADecryptOptions> {
-    return;
-  }
+  decrypt(options: AFAAuthOptions): Promise<AFADecryptOptions> { return; }
 
   /**
    * Check if service is available
    * @returns {Promise<any>} Returns a Promise that resolves if fingerprint auth is available on the device
    */
   @Cordova()
-  isAvailable(): Promise<{
-    isAvailable: boolean;
-    isHardwareDetected: boolean;
-    hasEnrolledFingerprints: boolean;
-  }> {
-    return;
-  }
+  isAvailable(): Promise<{ isAvailable: boolean, isHardwareDetected: boolean, hasEnrolledFingerprints: boolean }> { return; }
 
   /**
    * Delete the cipher used for encryption and decryption by username
    * @returns {Promise<any>} Returns a Promise that resolves if the cipher was successfully deleted
    */
   @Cordova()
-  delete(options: {
-    clientId: string;
-    username: string;
-  }): Promise<{ deleted: boolean }> {
-    return;
-  }
+  delete(options: { clientId: string; username: string; }): Promise<{ deleted: boolean }> { return; }
 }
diff --git a/src/@ionic-native/plugins/android-full-screen/index.ts b/src/@ionic-native/plugins/android-full-screen/index.ts
index cccbb56de..e0d023a98 100644
--- a/src/@ionic-native/plugins/android-full-screen/index.ts
+++ b/src/@ionic-native/plugins/android-full-screen/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * Bit flag values for setSystemUiVisibility()
@@ -62,81 +62,63 @@ export class AndroidFullScreen extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  isSupported(): Promise<void> {
-    return;
-  }
+  isSupported(): Promise<void> { return; }
 
   /**
    * Is immersive mode supported?
    * @return {Promise<void>}
    */
   @Cordova()
-  isImmersiveModeSupported(): Promise<void> {
-    return;
-  }
+  isImmersiveModeSupported(): Promise<void> { return; }
 
   /**
    * The width of the screen in immersive mode.
    * @return {Promise<number>}
    */
   @Cordova()
-  immersiveWidth(): Promise<number> {
-    return;
-  }
+  immersiveWidth(): Promise<number> { return; }
 
   /**
    * The height of the screen in immersive mode.
    * @return {Promise<number>}
    */
   @Cordova()
-  immersiveHeight(): Promise<number> {
-    return;
-  }
+  immersiveHeight(): Promise<number> { return; }
 
   /**
    * Hide system UI until user interacts.
    * @return {Promise<void>}
    */
   @Cordova()
-  leanMode(): Promise<void> {
-    return;
-  }
+  leanMode(): Promise<void> { return; }
 
   /**
    * Show system UI.
    * @return {Promise<void>}
    */
   @Cordova()
-  showSystemUI(): Promise<void> {
-    return;
-  }
+  showSystemUI(): Promise<void> { return; }
 
   /**
    * Extend your app underneath the status bar (Android 4.4+ only).
    * @return {Promise<void>}
    */
   @Cordova()
-  showUnderStatusBar(): Promise<void> {
-    return;
-  }
+  showUnderStatusBar(): Promise<void> { return; }
 
   /**
    * Extend your app underneath the system UI (Android 4.4+ only).
    * @return {Promise<void>}
    */
   @Cordova()
-  showUnderSystemUI(): Promise<void> {
-    return;
-  }
+  showUnderSystemUI(): Promise<void> { return; }
 
   /**
    * Hide system UI and keep it hidden (Android 4.4+ only).
    * @return {Promise<void>}
    */
   @Cordova()
-  immersiveMode(): Promise<void> {
-    return;
-  }
+  immersiveMode(): Promise<void> { return; }
 
   /**
    * Manually set the the system UI to a custom mode. This mirrors the Android method of the same name. (Android 4.4+ only).
@@ -145,7 +127,5 @@ export class AndroidFullScreen extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  setSystemUiVisibility(visibility: AndroidSystemUiFlags): Promise<void> {
-    return;
-  }
+  setSystemUiVisibility(visibility: AndroidSystemUiFlags): Promise<void> { return; }
 }
diff --git a/src/@ionic-native/plugins/android-permissions/index.ts b/src/@ionic-native/plugins/android-permissions/index.ts
index 1d265d4f9..6ee438268 100644
--- a/src/@ionic-native/plugins/android-permissions/index.ts
+++ b/src/@ionic-native/plugins/android-permissions/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Android Permissions
@@ -37,12 +37,12 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class AndroidPermissions extends IonicNativePlugin {
+
   PERMISSION: any = {
     ACCESS_CHECKIN_PROPERTIES: 'android.permission.ACCESS_CHECKIN_PROPERTIES',
     ACCESS_COARSE_LOCATION: 'android.permission.ACCESS_COARSE_LOCATION',
     ACCESS_FINE_LOCATION: 'android.permission.ACCESS_FINE_LOCATION',
-    ACCESS_LOCATION_EXTRA_COMMANDS:
-      'android.permission.ACCESS_LOCATION_EXTRA_COMMANDS',
+    ACCESS_LOCATION_EXTRA_COMMANDS: 'android.permission.ACCESS_LOCATION_EXTRA_COMMANDS',
     ACCESS_MOCK_LOCATION: 'android.permission.ACCESS_MOCK_LOCATION',
     ACCESS_NETWORK_STATE: 'android.permission.ACCESS_NETWORK_STATE',
     ACCESS_SURFACE_FLINGER: 'android.permission.ACCESS_SURFACE_FLINGER',
@@ -53,14 +53,12 @@ export class AndroidPermissions extends IonicNativePlugin {
     BATTERY_STATS: 'android.permission.BATTERY_STATS',
     BIND_ACCESSIBILITY_SERVICE: 'android.permission.BIND_ACCESSIBILITY_SERVICE',
     BIND_APPWIDGET: 'android.permission.BIND_APPWIDGET',
-    BIND_CARRIER_MESSAGING_SERVICE:
-      'android.permission.BIND_CARRIER_MESSAGING_SERVICE',
+    BIND_CARRIER_MESSAGING_SERVICE: 'android.permission.BIND_CARRIER_MESSAGING_SERVICE',
     BIND_DEVICE_ADMIN: 'android.permission.BIND_DEVICE_ADMIN',
     BIND_DREAM_SERVICE: 'android.permission.BIND_DREAM_SERVICE',
     BIND_INPUT_METHOD: 'android.permission.BIND_INPUT_METHOD',
     BIND_NFC_SERVICE: 'android.permission.BIND_NFC_SERVICE',
-    BIND_NOTIFICATION_LISTENER_SERVICE:
-      'android.permission.BIND_NOTIFICATION_LISTENER_SERVICE',
+    BIND_NOTIFICATION_LISTENER_SERVICE: 'android.permission.BIND_NOTIFICATION_LISTENER_SERVICE',
     BIND_PRINT_SERVICE: 'android.permission.BIND_PRINT_SERVICE',
     BIND_REMOTEVIEWS: 'android.permission.BIND_REMOTEVIEWS',
     BIND_TEXT_SERVICE: 'android.permission.BIND_TEXT_SERVICE',
@@ -81,15 +79,12 @@ export class AndroidPermissions extends IonicNativePlugin {
     CALL_PRIVILEGED: 'android.permission.CALL_PRIVILEGED',
     CAMERA: 'android.permission.CAMERA',
     CAPTURE_AUDIO_OUTPUT: 'android.permission.CAPTURE_AUDIO_OUTPUT',
-    CAPTURE_SECURE_VIDEO_OUTPUT:
-      'android.permission.CAPTURE_SECURE_VIDEO_OUTPUT',
+    CAPTURE_SECURE_VIDEO_OUTPUT: 'android.permission.CAPTURE_SECURE_VIDEO_OUTPUT',
     CAPTURE_VIDEO_OUTPUT: 'android.permission.CAPTURE_VIDEO_OUTPUT',
-    CHANGE_COMPONENT_ENABLED_STATE:
-      'android.permission.CHANGE_COMPONENT_ENABLED_STATE',
+    CHANGE_COMPONENT_ENABLED_STATE: 'android.permission.CHANGE_COMPONENT_ENABLED_STATE',
     CHANGE_CONFIGURATION: 'android.permission.CHANGE_CONFIGURATION',
     CHANGE_NETWORK_STATE: 'android.permission.CHANGE_NETWORK_STATE',
-    CHANGE_WIFI_MULTICAST_STATE:
-      'android.permission.CHANGE_WIFI_MULTICAST_STATE',
+    CHANGE_WIFI_MULTICAST_STATE: 'android.permission.CHANGE_WIFI_MULTICAST_STATE',
     CHANGE_WIFI_STATE: 'android.permission.CHANGE_WIFI_STATE',
     CLEAR_APP_CACHE: 'android.permission.CLEAR_APP_CACHE',
     CLEAR_APP_USER_DATA: 'android.permission.CLEAR_APP_USER_DATA',
@@ -135,8 +130,7 @@ export class AndroidPermissions extends IonicNativePlugin {
     READ_CONTACTS: 'android.permission.READ_CONTACTS',
     READ_EXTERNAL_STORAGE: 'android.permission.READ_EXTERNAL_STORAGE',
     READ_FRAME_BUFFER: 'android.permission.READ_FRAME_BUFFER',
-    READ_HISTORY_BOOKMARKS:
-      'com.android.browser.permission.READ_HISTORY_BOOKMARKS',
+    READ_HISTORY_BOOKMARKS: 'com.android.browser.permission.READ_HISTORY_BOOKMARKS',
     READ_INPUT_STATE: 'android.permission.READ_INPUT_STATE',
     READ_LOGS: 'android.permission.READ_LOGS',
     READ_PHONE_STATE: 'android.permission.READ_PHONE_STATE',
@@ -170,8 +164,7 @@ export class AndroidPermissions extends IonicNativePlugin {
     SET_TIME_ZONE: 'android.permission.SET_TIME_ZONE',
     SET_WALLPAPER: 'android.permission.SET_WALLPAPER',
     SET_WALLPAPER_HINTS: 'android.permission.SET_WALLPAPER_HINTS',
-    SIGNAL_PERSISTENT_PROCESSES:
-      'android.permission.SIGNAL_PERSISTENT_PROCESSES',
+    SIGNAL_PERSISTENT_PROCESSES: 'android.permission.SIGNAL_PERSISTENT_PROCESSES',
     STATUS_BAR: 'android.permission.STATUS_BAR',
     SUBSCRIBED_FEEDS_READ: 'android.permission.SUBSCRIBED_FEEDS_READ',
     SUBSCRIBED_FEEDS_WRITE: 'android.permission.SUBSCRIBED_FEEDS_WRITE',
@@ -189,8 +182,7 @@ export class AndroidPermissions extends IonicNativePlugin {
     WRITE_CONTACTS: 'android.permission.WRITE_CONTACTS',
     WRITE_EXTERNAL_STORAGE: 'android.permission.WRITE_EXTERNAL_STORAGE',
     WRITE_GSERVICES: 'android.permission.WRITE_GSERVICES',
-    WRITE_HISTORY_BOOKMARKS:
-      'com.android.browser.permission.WRITE_HISTORY_BOOKMARKS',
+    WRITE_HISTORY_BOOKMARKS: 'com.android.browser.permission.WRITE_HISTORY_BOOKMARKS',
     WRITE_PROFILE: 'android.permission.WRITE_PROFILE',
     WRITE_SECURE_SETTINGS: 'android.permission.WRITE_SECURE_SETTINGS',
     WRITE_SETTINGS: 'android.permission.WRITE_SETTINGS',
@@ -198,7 +190,7 @@ export class AndroidPermissions extends IonicNativePlugin {
     WRITE_SOCIAL_STREAM: 'android.permission.WRITE_SOCIAL_STREAM',
     WRITE_SYNC_SETTINGS: 'android.permission.WRITE_SYNC_SETTINGS',
     WRITE_USER_DICTIONARY: 'android.permission.WRITE_USER_DICTIONARY',
-    WRITE_VOICEMAIL: 'com.android.voicemail.permission.WRITE_VOICEMAIL'
+    WRITE_VOICEMAIL: 'com.android.voicemail.permission.WRITE_VOICEMAIL',
   };
 
   /**
@@ -207,9 +199,7 @@ export class AndroidPermissions extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  checkPermission(permission: string): Promise<any> {
-    return;
-  }
+  checkPermission(permission: string): Promise<any> { return; }
 
   /**
    * Request permission
@@ -217,9 +207,7 @@ export class AndroidPermissions extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  requestPermission(permission: string): Promise<any> {
-    return;
-  }
+  requestPermission(permission: string): Promise<any> { return; }
 
   /**
    * Request permissions
@@ -227,9 +215,7 @@ export class AndroidPermissions extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  requestPermissions(permissions: string[]): Promise<any> {
-    return;
-  }
+  requestPermissions(permissions: string[]): Promise<any> { return; }
 
   /**
    * This function still works now, will not support in the future.
@@ -237,7 +223,6 @@ export class AndroidPermissions extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  hasPermission(permission: string): Promise<any> {
-    return;
-  }
+  hasPermission(permission: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/app-availability/index.ts b/src/@ionic-native/plugins/app-availability/index.ts
index 391ce5468..3ff0b1996 100644
--- a/src/@ionic-native/plugins/app-availability/index.ts
+++ b/src/@ionic-native/plugins/app-availability/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name App Availability
@@ -41,13 +41,13 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class AppAvailability extends IonicNativePlugin {
+
   /**
    * Checks if an app is available on device
    * @param {string} app Package name on android, or URI scheme on iOS
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  check(app: string): Promise<boolean> {
-    return;
-  }
+  check(app: string): Promise<boolean> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/app-minimize/index.ts b/src/@ionic-native/plugins/app-minimize/index.ts
index 61dca97df..5179a9b06 100644
--- a/src/@ionic-native/plugins/app-minimize/index.ts
+++ b/src/@ionic-native/plugins/app-minimize/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name App Minimize
@@ -31,12 +31,12 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class AppMinimize extends IonicNativePlugin {
+
   /**
    * Minimizes the application
    * @return {Promise<any>}
    */
   @Cordova()
-  minimize(): Promise<any> {
-    return;
-  }
+  minimize(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/app-preferences/index.ts b/src/@ionic-native/plugins/app-preferences/index.ts
index 03eac849c..6b7924315 100644
--- a/src/@ionic-native/plugins/app-preferences/index.ts
+++ b/src/@ionic-native/plugins/app-preferences/index.ts
@@ -1,6 +1,6 @@
-import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
+import { Injectable } from '@angular/core';
 
 /**
  * @name App Preferences
@@ -25,18 +25,11 @@ import { Observable } from 'rxjs/Observable';
   plugin: 'cordova-plugin-app-preferences',
   pluginRef: 'plugins.appPreferences',
   repo: 'https://github.com/apla/me.apla.cordova.app-preferences',
-  platforms: [
-    'Android',
-    'BlackBerry 10',
-    'Browser',
-    'iOS',
-    'macOS',
-    'Windows 8',
-    'Windows Phone'
-  ]
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'macOS', 'Windows 8', 'Windows Phone']
 })
 @Injectable()
 export class AppPreferences extends IonicNativePlugin {
+
   /**
    * Get a preference value
    *
@@ -47,9 +40,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  fetch(dict: string, key?: string): Promise<any> {
-    return;
-  }
+  fetch(dict: string, key?: string): Promise<any> { return; }
 
   /**
    * Set a preference value
@@ -76,9 +67,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  remove(dict: string, key?: string): Promise<any> {
-    return;
-  }
+  remove(dict: string, key?: string): Promise<any> { return; }
 
   /**
    * Clear preferences
@@ -88,9 +77,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  clearAll(): Promise<any> {
-    return;
-  }
+  clearAll(): Promise<any> { return; }
 
   /**
    * Show native preferences interface
@@ -100,9 +87,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  show(): Promise<any> {
-    return;
-  }
+  show(): Promise<any> { return; }
 
   /**
    * Show native preferences interface
@@ -113,9 +98,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  watch(subscribe: boolean): Observable<any> {
-    return;
-  }
+  watch(subscribe: boolean): Observable<any> { return; }
 
   /**
    * Return named configuration context
@@ -128,17 +111,13 @@ export class AppPreferences extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  suite(suiteName: string): any {
-    return;
-  }
+  suite(suiteName: string): any { return; }
 
   @Cordova({
     platforms: ['iOS'],
     sync: true
   })
-  iosSuite(suiteName: string): any {
-    return;
-  }
+  iosSuite(suiteName: string): any { return; }
 
   /**
    * Return cloud synchronized configuration context
@@ -148,9 +127,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS', 'Windows', 'Windows Phone 8']
   })
-  cloudSync(): Object {
-    return;
-  }
+  cloudSync(): Object { return; }
 
   /**
    * Return default configuration context
@@ -160,7 +137,6 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS', 'Windows', 'Windows Phone 8']
   })
-  defaults(): Object {
-    return;
-  }
+  defaults(): Object { return; }
+
 }
diff --git a/src/@ionic-native/plugins/app-rate/index.ts b/src/@ionic-native/plugins/app-rate/index.ts
index 3d50780f7..170ee7b4a 100644
--- a/src/@ionic-native/plugins/app-rate/index.ts
+++ b/src/@ionic-native/plugins/app-rate/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface AppRatePreferences {
   /**
diff --git a/src/@ionic-native/plugins/app-version/index.ts b/src/@ionic-native/plugins/app-version/index.ts
index 480bda362..a612159d2 100644
--- a/src/@ionic-native/plugins/app-version/index.ts
+++ b/src/@ionic-native/plugins/app-version/index.ts
@@ -1,5 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
+
 
 /**
  * @name App Version
@@ -33,39 +35,33 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class AppVersion extends IonicNativePlugin {
+
   /**
    * Returns the name of the app
    * @returns {Promise<string>}
    */
   @Cordova()
-  getAppName(): Promise<string> {
-    return;
-  }
+  getAppName(): Promise<string> { return; }
 
   /**
    * Returns the package name of the app
    * @returns {Promise<string>}
    */
   @Cordova()
-  getPackageName(): Promise<string> {
-    return;
-  }
+  getPackageName(): Promise<string> { return; }
 
   /**
    * Returns the build identifier of the app
    * @returns {Promise<string>}
    */
   @Cordova()
-  getVersionCode(): Promise<string> {
-    return;
-  }
+  getVersionCode(): Promise<string> { return; }
 
   /**
    * Returns the version of the app
    * @returns {Promise<string>}
    */
   @Cordova()
-  getVersionNumber(): Promise<string> {
-    return;
-  }
+  getVersionNumber(): Promise<string> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/apple-pay/index.ts b/src/@ionic-native/plugins/apple-pay/index.ts
index 1c90e671c..1995cb496 100644
--- a/src/@ionic-native/plugins/apple-pay/index.ts
+++ b/src/@ionic-native/plugins/apple-pay/index.ts
@@ -1,32 +1,17 @@
-import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
+import {Injectable} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
+import {
+  Plugin,
+  Cordova,
+  IonicNativePlugin
+} from '@ionic-native/core';
 
-export type IMakePayments =
-  | 'This device can make payments and has a supported card'
-  | 'This device cannot make payments.'
-  | 'This device can make payments but has no supported cards';
+export type IMakePayments = 'This device can make payments and has a supported card' | 'This device cannot make payments.' | 'This device can make payments but has no supported cards';
 export type IShippingType = 'shipping' | 'delivery' | 'store' | 'service';
-export type IBillingRequirement =
-  | 'none'
-  | 'all'
-  | 'postcode'
-  | 'name'
-  | 'email'
-  | 'phone';
-export type ITransactionStatus =
-  | 'success'
-  | 'failure'
-  | 'invalid-billing-address'
-  | 'invalid-shipping-address'
-  | 'invalid-shipping-contact'
-  | 'require-pin'
-  | 'incorrect-pin'
-  | 'locked-pin';
+export type IBillingRequirement =  'none' | 'all' | 'postcode' | 'name' | 'email' | 'phone';
+export type ITransactionStatus = 'success' | 'failure' | 'invalid-billing-address' | 'invalid-shipping-address' | 'invalid-shipping-contact' | 'require-pin' | 'incorrect-pin' | 'locked-pin';
 export type ICompleteTransaction = 'Payment status applied.';
-export type IUpdateItemsAndShippingStatus =
-  | 'Updated List Info'
-  | 'Did you make a payment request?';
+export type IUpdateItemsAndShippingStatus = 'Updated List Info' | 'Did you make a payment request?';
 
 export interface IPaymentResponse {
   billingNameFirst?: string;
@@ -65,7 +50,7 @@ export interface IOrderItem {
   label: string;
   amount: number;
 }
-export interface IShippingMethod {
+export interface  IShippingMethod {
   identifier: string;
   label: string;
   detail: string;
@@ -150,10 +135,11 @@ export interface ISelectedShippingContact {
   plugin: 'cordova-plugin-applepay',
   pluginRef: 'ApplePay',
   repo: 'https://github.com/samkelleher/cordova-plugin-applepay',
-  platforms: ['iOS']
+  platforms: ['iOS'],
 })
 @Injectable()
 export class ApplePay extends IonicNativePlugin {
+
   /**
    * Detects if the current device supports Apple Pay and has any capable cards registered.
    * @return {Promise<IMakePayments>} Returns a promise
@@ -188,9 +174,7 @@ export class ApplePay extends IonicNativePlugin {
     observable: true,
     clearFunction: 'stopListeningForShippingContactSelection'
   })
-  startListeningForShippingContactSelection(): Observable<
-    ISelectedShippingContact
-  > {
+  startListeningForShippingContactSelection(): Observable<ISelectedShippingContact> {
     return;
   }
 
@@ -244,9 +228,7 @@ export class ApplePay extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  updateItemsAndShippingMethods(
-    list: IOrderItemsAndShippingMethods
-  ): Promise<IUpdateItemsAndShippingStatus> {
+  updateItemsAndShippingMethods(list: IOrderItemsAndShippingMethods): Promise<IUpdateItemsAndShippingStatus> {
     return;
   }
 
@@ -339,9 +321,7 @@ export class ApplePay extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  completeLastTransaction(
-    complete: ITransactionStatus
-  ): Promise<ICompleteTransaction> {
+  completeLastTransaction(complete: ITransactionStatus): Promise<ICompleteTransaction> {
     return;
   }
 }
diff --git a/src/@ionic-native/plugins/appodeal/index.ts b/src/@ionic-native/plugins/appodeal/index.ts
index fc2e6f06c..5d72981f1 100644
--- a/src/@ionic-native/plugins/appodeal/index.ts
+++ b/src/@ionic-native/plugins/appodeal/index.ts
@@ -1,6 +1,6 @@
-import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs';
+import { Injectable } from '@angular/core';
 
 /**
  * @name Appodeal
@@ -46,16 +46,14 @@ export class Appodeal extends IonicNativePlugin {
    * @param {number} adType
    */
   @Cordova()
-  initialize(appKey: string, adType: number): void {}
+  initialize(appKey: string, adType: number): void { };
 
   /**
    * check if SDK has been initialized
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isInitialized(): Promise<any> {
-    return;
-  }
+  isInitialized(): Promise<any> { return; };
 
   /**
    * show ad of specified type
@@ -63,9 +61,7 @@ export class Appodeal extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  show(adType: number): Promise<any> {
-    return;
-  }
+  show(adType: number): Promise<any> { return; };
 
   /**
    * show ad of specified type with placement options
@@ -74,23 +70,24 @@ export class Appodeal extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  showWithPlacement(adType: number, placement: any): Promise<any> {
-    return;
-  }
+  showWithPlacement(
+    adType: number,
+    placement: any
+    ): Promise<any> { return; };
 
   /**
    * hide ad of specified type
    * @param {number} adType
    */
   @Cordova()
-  hide(adType: number): void {}
+  hide(adType: number): void { };
 
   /**
    * confirm use of ads of specified type
    * @param {number} adType
    */
   @Cordova()
-  confirm(adType: number): void {}
+  confirm(adType: number): void { };
 
   /**
    * check if ad of specified type has been loaded
@@ -98,9 +95,7 @@ export class Appodeal extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isLoaded(adType: number): Promise<any> {
-    return;
-  }
+  isLoaded(adType: number): Promise<any> { return; };
 
   /**
    * check if ad of specified
@@ -108,9 +103,7 @@ export class Appodeal extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isPrecache(adType: number): Promise<any> {
-    return;
-  }
+  isPrecache(adType: number): Promise<any> { return; };
 
   /**
    *
@@ -118,77 +111,75 @@ export class Appodeal extends IonicNativePlugin {
    * @param autoCache
    */
   @Cordova()
-  setAutoCache(adType: number, autoCache: any): void {}
+  setAutoCache(adType: number, autoCache: any): void { };
 
   /**
    * forcefully cache an ad by type
    * @param {number} adType
    */
   @Cordova()
-  cache(adType: number): void {}
+  cache(adType: number): void { };
 
   /**
    *
    * @param {boolean} set
    */
   @Cordova()
-  setOnLoadedTriggerBoth(set: boolean): void {}
+  setOnLoadedTriggerBoth(set: boolean): void { };
 
   /**
    * enable or disable Smart Banners
    * @param {boolean} enabled
    */
   @Cordova()
-  setSmartBanners(enabled: boolean): void {}
+  setSmartBanners(enabled: boolean): void { };
 
   /**
    * enable or disable banner backgrounds
    * @param {boolean} enabled
    */
   @Cordova()
-  setBannerBackground(enabled: boolean): void {}
+  setBannerBackground(enabled: boolean): void { };
 
   /**
    * enable or disable banner animations
    * @param {boolean} enabled
    */
   @Cordova()
-  setBannerAnimation(enabled: boolean): void {}
+  setBannerAnimation(enabled: boolean): void { };
 
   /**
    *
    * @param value
    */
   @Cordova()
-  set728x90Banners(value: any): void {}
+  set728x90Banners(value: any): void { };
 
   /**
    * enable or disable logging
    * @param {boolean} logging
    */
   @Cordova()
-  setLogging(logging: boolean): void {}
+  setLogging(logging: boolean): void { };
 
   /**
    * enable or disable testing mode
    * @param {boolean} testing
    */
   @Cordova()
-  setTesting(testing: boolean): void {}
+  setTesting(testing: boolean): void { };
 
   /**
    * reset device ID
    */
   @Cordova()
-  resetUUID(): void {}
+  resetUUID(): void { };
 
   /**
    * get version of Appdeal SDK
    */
   @Cordova()
-  getVersion(): Promise<any> {
-    return;
-  }
+  getVersion(): Promise<any> { return; };
 
   /**
    *
@@ -196,7 +187,7 @@ export class Appodeal extends IonicNativePlugin {
    * @param {number} adType
    */
   @Cordova()
-  disableNetwork(network?: string, adType?: number): void {}
+  disableNetwork(network?: string, adType?: number): void { };
 
   /**
    *
@@ -204,54 +195,54 @@ export class Appodeal extends IonicNativePlugin {
    * @param {number} adType
    */
   @Cordova()
-  disableNetworkType(network?: string, adType?: number): void {}
+  disableNetworkType(network?: string, adType?: number): void { };
 
   /**
    * disable Location permissions for Appodeal SDK
    */
   @Cordova()
-  disableLocationPermissionCheck(): void {}
+  disableLocationPermissionCheck(): void { };
 
   /**
    * disable Storage permissions for Appodeal SDK
    */
   @Cordova()
-  disableWriteExternalStoragePermissionCheck(): void {}
+  disableWriteExternalStoragePermissionCheck(): void { };
 
   /**
    * enable event listeners
    * @param {boolean} enabled
    */
   @Cordova()
-  enableInterstitialCallbacks(enabled: boolean): void {}
+  enableInterstitialCallbacks(enabled: boolean): void { };
 
   /**
    * enable event listeners
    * @param {boolean} enabled
    */
   @Cordova()
-  enableSkippableVideoCallbacks(enabled: boolean): void {}
+  enableSkippableVideoCallbacks(enabled: boolean): void { };
 
   /**
    * enable event listeners
    * @param {boolean} enabled
    */
   @Cordova()
-  enableNonSkippableVideoCallbacks(enabled: boolean): void {}
+  enableNonSkippableVideoCallbacks(enabled: boolean): void { };
 
   /**
    * enable event listeners
    * @param {boolean} enabled
    */
   @Cordova()
-  enableBannerCallbacks(enabled: boolean): void {}
+  enableBannerCallbacks(enabled: boolean): void { };
 
   /**
    * enable event listeners
    * @param {boolean} enabled
    */
   @Cordova()
-  enableRewardedVideoCallbacks(enabled: boolean): void {}
+  enableRewardedVideoCallbacks(enabled: boolean): void { };
 
   /**
    *
@@ -259,7 +250,7 @@ export class Appodeal extends IonicNativePlugin {
    * @param {boolean} value
    */
   @Cordova()
-  setCustomBooleanRule(name: string, value: boolean): void {}
+  setCustomBooleanRule(name: string, value: boolean): void { };
 
   /**
    *
@@ -267,7 +258,7 @@ export class Appodeal extends IonicNativePlugin {
    * @param {number} value
    */
   @Cordova()
-  setCustomIntegerRule(name: string, value: number): void {}
+  setCustomIntegerRule(name: string, value: number): void { };
 
   /**
    * set rule with float value
@@ -275,7 +266,7 @@ export class Appodeal extends IonicNativePlugin {
    * @param {number} value
    */
   @Cordova()
-  setCustomDoubleRule(name: string, value: number): void {}
+  setCustomDoubleRule(name: string, value: number): void { };
 
   /**
    * set rule with string value
@@ -283,291 +274,243 @@ export class Appodeal extends IonicNativePlugin {
    * @param {string} value
    */
   @Cordova()
-  setCustomStringRule(name: string, value: string): void {}
+  setCustomStringRule(name: string, value: string): void { };
 
   /**
    * set ID preference in Appodeal for current user
    * @param id
    */
   @Cordova()
-  setUserId(id: any): void {}
+  setUserId(id: any): void { };
 
   /**
    * set Email preference in Appodeal for current user
    * @param email
    */
   @Cordova()
-  setEmail(email: any): void {}
+  setEmail(email: any): void { };
 
   /**
    * set Birthday preference in Appodeal for current user
    * @param birthday
    */
   @Cordova()
-  setBirthday(birthday: any): void {}
+  setBirthday(birthday: any): void { };
 
   /**
    * et Age preference in Appodeal for current user
    * @param age
    */
   @Cordova()
-  setAge(age: any): void {}
+  setAge(age: any): void { };
 
   /**
    * set Gender preference in Appodeal for current user
    * @param gender
    */
   @Cordova()
-  setGender(gender: any): void {}
+  setGender(gender: any): void { };
 
   /**
    * set Occupation preference in Appodeal for current user
    * @param occupation
    */
   @Cordova()
-  setOccupation(occupation: any): void {}
+  setOccupation(occupation: any): void { };
 
   /**
    * set Relation preference in Appodeal for current user
    * @param relation
    */
   @Cordova()
-  setRelation(relation: any): void {}
+  setRelation(relation: any): void { };
 
   /**
    * set Smoking preference in Appodeal for current user
    * @param smoking
    */
   @Cordova()
-  setSmoking(smoking: any): void {}
+  setSmoking(smoking: any): void { };
 
   /**
    * set Alcohol preference in Appodeal for current user
    * @param alcohol
    */
   @Cordova()
-  setAlcohol(alcohol: any): void {}
+  setAlcohol(alcohol: any): void { };
 
   /**
    * set Interests preference in Appodeal for current user
    * @param interests
    */
   @Cordova()
-  setInterests(interests: any): void {}
+  setInterests(interests: any): void { };
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialLoaded',
     element: document
   })
-  onInterstitialLoaded(): Observable<any> {
-    return;
-  }
+  onInterstitialLoaded(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialFailedToLoad',
     element: document
   })
-  onInterstitialFailedToLoad(): Observable<any> {
-    return;
-  }
+  onInterstitialFailedToLoad(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialShown',
     element: document
   })
-  onInterstitialShown(): Observable<any> {
-    return;
-  }
+  onInterstitialShown(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialClicked',
     element: document
   })
-  onInterstitialClicked(): Observable<any> {
-    return;
-  }
+  onInterstitialClicked(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialClosed',
     element: document
   })
-  onInterstitialClosed(): Observable<any> {
-    return;
-  }
+  onInterstitialClosed(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoLoaded',
     element: document
   })
-  onSkippableVideoLoaded(): Observable<any> {
-    return;
-  }
+  onSkippableVideoLoaded(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoFailedToLoad',
     element: document
   })
-  onSkippableVideoFailedToLoad(): Observable<any> {
-    return;
-  }
+  onSkippableVideoFailedToLoad(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoShown',
     element: document
   })
-  onSkippableVideoShown(): Observable<any> {
-    return;
-  }
+  onSkippableVideoShown(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoFinished',
     element: document
   })
-  onSkippableVideoFinished(): Observable<any> {
-    return;
-  }
+  onSkippableVideoFinished(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoClosed',
     element: document
   })
-  onSkippableVideoClosed(): Observable<any> {
-    return;
-  }
+  onSkippableVideoClosed(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoLoaded',
     element: document
   })
-  onRewardedVideoLoaded(): Observable<any> {
-    return;
-  }
+  onRewardedVideoLoaded(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoFailedToLoad',
     element: document
   })
-  onRewardedVideoFailedToLoad(): Observable<any> {
-    return;
-  }
+  onRewardedVideoFailedToLoad(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoShown',
     element: document
   })
-  onRewardedVideoShown(): Observable<any> {
-    return;
-  }
+  onRewardedVideoShown(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoFinished',
     element: document
   })
-  onRewardedVideoFinished(): Observable<any> {
-    return;
-  }
+  onRewardedVideoFinished(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoClosed',
     element: document
   })
-  onRewardedVideoClosed(): Observable<any> {
-    return;
-  }
+  onRewardedVideoClosed(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoLoaded',
     element: document
   })
-  onNonSkippableVideoLoaded(): Observable<any> {
-    return;
-  }
+  onNonSkippableVideoLoaded(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoFailedToLoad',
     element: document
   })
-  onNonSkippableVideoFailedToLoad(): Observable<any> {
-    return;
-  }
+  onNonSkippableVideoFailedToLoad(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoShown',
     element: document
   })
-  onNonSkippableVideoShown(): Observable<any> {
-    return;
-  }
+  onNonSkippableVideoShown(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoFinished',
     element: document
   })
-  onNonSkippableVideoFinished(): Observable<any> {
-    return;
-  }
+  onNonSkippableVideoFinished(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoClosed',
     element: document
   })
-  onNonSkippableVideoClosed(): Observable<any> {
-    return;
-  }
+  onNonSkippableVideoClosed(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerClicked',
     element: document
   })
-  onBannerClicked(): Observable<any> {
-    return;
-  }
+  onBannerClicked(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerFailedToLoad',
     element: document
   })
-  onBannerFailedToLoad(): Observable<any> {
-    return;
-  }
+  onBannerFailedToLoad(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerLoaded',
     element: document
   })
-  onBannerLoaded(): Observable<any> {
-    return;
-  }
+  onBannerLoaded(): Observable<any> { return; }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerShown',
     element: document
   })
-  onBannerShown(): Observable<any> {
-    return;
-  }
+  onBannerShown(): Observable<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/autostart/index.ts b/src/@ionic-native/plugins/autostart/index.ts
index d04686e03..e57c0d829 100644
--- a/src/@ionic-native/plugins/autostart/index.ts
+++ b/src/@ionic-native/plugins/autostart/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Autostart
@@ -31,15 +31,17 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Autostart extends IonicNativePlugin {
+
   /**
    * Enable the automatic startup after the boot
    */
   @Cordova({ sync: true })
-  enable(): void {}
+  enable(): void { }
 
   /**
    * Disable the automatic startup after the boot
    */
   @Cordova({ sync: true })
-  disable(): void {}
+  disable(): void { }
+
 }
diff --git a/src/@ionic-native/plugins/background-fetch/index.ts b/src/@ionic-native/plugins/background-fetch/index.ts
index 32db990da..67bcae52a 100644
--- a/src/@ionic-native/plugins/background-fetch/index.ts
+++ b/src/@ionic-native/plugins/background-fetch/index.ts
@@ -1,13 +1,15 @@
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface BackgroundFetchConfig {
+
   /**
    * Set true to cease background-fetch from operating after user "closes" the app. Defaults to true.
    */
   stopOnTerminate?: boolean;
 }
 
+
 /**
  * @name Background Fetch
  * @description
@@ -59,6 +61,8 @@ export interface BackgroundFetchConfig {
 })
 @Injectable()
 export class BackgroundFetch extends IonicNativePlugin {
+
+
   /**
    * Configures the plugin's fetch callbackFn
    *
@@ -68,9 +72,7 @@ export class BackgroundFetch extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  configure(config: BackgroundFetchConfig): Promise<any> {
-    return;
-  }
+  configure(config: BackgroundFetchConfig): Promise<any> { return; }
 
   /**
    * Start the background-fetch API.
@@ -78,18 +80,14 @@ export class BackgroundFetch extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  start(): Promise<any> {
-    return;
-  }
+  start(): Promise<any> { return; }
 
   /**
    * Stop the background-fetch API from firing fetch events. Your callbackFn provided to #configure will no longer be executed.
    * @returns {Promise<any>}
    */
   @Cordova()
-  stop(): Promise<any> {
-    return;
-  }
+  stop(): Promise<any> { return; }
 
   /**
    * You MUST call this method in your fetch callbackFn provided to #configure in order to signal to iOS that your fetch action is complete. iOS provides only 30s of background-time for a fetch-event -- if you exceed this 30s, iOS will kill your app.
@@ -97,14 +95,13 @@ export class BackgroundFetch extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  finish(): void {}
+  finish(): void { }
 
   /**
    * Return the status of the background-fetch
    * @returns {Promise<any>}
    */
   @Cordova()
-  status(): Promise<any> {
-    return;
-  }
+  status(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/background-geolocation/index.ts b/src/@ionic-native/plugins/background-geolocation/index.ts
index 5d4cb90df..99461d26e 100644
--- a/src/@ionic-native/plugins/background-geolocation/index.ts
+++ b/src/@ionic-native/plugins/background-geolocation/index.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface BackgroundGeolocationResponse {
+
   /**
    * ID of location as stored in DB (or null)
    */
@@ -49,8 +50,8 @@ export interface BackgroundGeolocationResponse {
   altitude: number;
 
   /**
-   * accuracy of the altitude if available.
-   */
+    * accuracy of the altitude if available.
+    */
   altitudeAccuracy: number;
 
   /**
@@ -70,6 +71,7 @@ export interface BackgroundGeolocationResponse {
 }
 
 export interface BackgroundGeolocationConfig {
+
   /**
    * Desired accuracy in meters. Possible values [0, 10, 100, 1000]. The lower
    * the number, the more power devoted to GeoLocation resulting in higher
@@ -106,19 +108,19 @@ export interface BackgroundGeolocationConfig {
    */
   stopOnTerminate?: boolean;
 
-  /**
-   * ANDROID ONLY
-   * Start background service on device boot.
+  /**

+   * ANDROID ONLY

+   * Start background service on device boot.

    *
-   * Defaults to false
+   * Defaults to false

    */
   startOnBoot?: boolean;
 
-  /**
-   * ANDROID ONLY
+  /**

+   * ANDROID ONLY

    * If false location service will not be started in foreground and no notification will be shown.
    *
-   * Defaults to true
+   * Defaults to true

    */
   startForeground?: boolean;
 
@@ -153,17 +155,17 @@ export interface BackgroundGeolocationConfig {
    */
   notificationIconColor?: string;
 
-  /**
-   * ANDROID ONLY
-   * The filename of a custom notification icon. See android quirks.
-   * NOTE: Only available for API Level >=21.
+  /**

+   * ANDROID ONLY

+   * The filename of a custom notification icon. See android quirks.

+   * NOTE: Only available for API Level >=21.

    */
   notificationIconLarge?: string;
 
-  /**
-   * ANDROID ONLY
-   * The filename of a custom notification icon. See android quirks.
-   * NOTE: Only available for API Level >=21.
+  /**

+   * ANDROID ONLY

+   * The filename of a custom notification icon. See android quirks.

+   * NOTE: Only available for API Level >=21.

    */
   notificationIconSmall?: string;
 
@@ -181,50 +183,50 @@ export interface BackgroundGeolocationConfig {
    */
   activityType?: string;
 
-  /**
-   * IOS ONLY
-   * Pauses location updates when app is paused
+  /**

+   * IOS ONLY

+   * Pauses location updates when app is paused

    *
-   * Defaults to true
+   * Defaults to true

    */
   pauseLocationUpdates?: boolean;
 
-  /**
-   * Server url where to send HTTP POST with recorded locations
-   * @see https://github.com/mauron85/cordova-plugin-background-geolocation#http-locations-posting
+  /**

+   * Server url where to send HTTP POST with recorded locations

+   * @see https://github.com/mauron85/cordova-plugin-background-geolocation#http-locations-posting

    */
   url?: string;
 
-  /**
-   * Server url where to send fail to post locations
-   * @see https://github.com/mauron85/cordova-plugin-background-geolocation#http-locations-posting
+  /**

+   * Server url where to send fail to post locations

+   * @see https://github.com/mauron85/cordova-plugin-background-geolocation#http-locations-posting

    */
   syncUrl?: string;
 
   /**
-   * Specifies how many previously failed locations will be sent to server at once
+   * Specifies how many previously failed locations will be sent to server at once

    *
-   * Defaults to 100
+   * Defaults to 100

    */
   syncThreshold?: number;
 
-  /**
-   * Optional HTTP headers sent along in HTTP request
+  /**

+   * Optional HTTP headers sent along in HTTP request

    */
   httpHeaders?: any;
 
   /**
-   * IOS ONLY
+   * IOS ONLY

    * Switch to less accurate significant changes and region monitory when in background (default)
    *
-   * Defaults to 100
+   * Defaults to 100

    */
   saveBatteryOnBackground?: boolean;
 
-  /**
-   * Limit maximum number of locations stored into db
+  /**

+   * Limit maximum number of locations stored into db

    *
-   * Defaults to 10000
+   * Defaults to 10000

    */
   maxLocations?: number;
 
@@ -308,14 +310,15 @@ export interface BackgroundGeolocationConfig {
 })
 @Injectable()
 export class BackgroundGeolocation extends IonicNativePlugin {
-  /**
-   * Set location service provider @see https://github.com/mauron85/cordova-plugin-background-geolocation/wiki/Android-providers
+
+  /**

+   * Set location service provider @see https://github.com/mauron85/cordova-plugin-background-geolocation/wiki/Android-providers

    *
    * Possible values:
-   *  ANDROID_DISTANCE_FILTER_PROVIDER: 0,
-   *  ANDROID_ACTIVITY_PROVIDER: 1
+   *  ANDROID_DISTANCE_FILTER_PROVIDER: 0,

+   *  ANDROID_ACTIVITY_PROVIDER: 1

    *
-   * @enum {number}
+   * @enum {number}

    */
   LocationProvider: any = {
     ANDROID_DISTANCE_FILTER_PROVIDER: 0,
@@ -323,17 +326,17 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   };
 
   /**
-   * Desired accuracy in meters. Possible values [0, 10, 100, 1000].
-   * The lower the number, the more power devoted to GeoLocation resulting in higher accuracy readings.
-   * 1000 results in lowest power drain and least accurate readings.
+   * Desired accuracy in meters. Possible values [0, 10, 100, 1000].

+   * The lower the number, the more power devoted to GeoLocation resulting in higher accuracy readings.

+   * 1000 results in lowest power drain and least accurate readings.

    *
    * Possible values:
-   *  HIGH: 0
-   *  MEDIUM: 10
-   *  LOW: 100
+   *  HIGH: 0

+   *  MEDIUM: 10

+   *  LOW: 100

    *  PASSIVE: 1000
    *
-   * enum {number}
+   * enum {number}

    */
   Accuracy: any = {
     HIGH: 0,
@@ -342,14 +345,14 @@ export class BackgroundGeolocation extends IonicNativePlugin {
     PASSIVE: 1000
   };
 
-  /**
-   * Used in the switchMode function
+  /**

+   * Used in the switchMode function

    *
    * Possible values:
    *  BACKGROUND: 0
-   *  FOREGROUND: 1
+   *  FOREGROUND: 1

    *
-   * @enum {number}
+   * @enum {number}

    */
   Mode: any = {
     BACKGROUND: 0,
@@ -366,11 +369,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
     callbackOrder: 'reverse',
     observable: true
   })
-  configure(
-    options: BackgroundGeolocationConfig
-  ): Observable<BackgroundGeolocationResponse> {
-    return;
-  }
+  configure(options: BackgroundGeolocationConfig): Observable<BackgroundGeolocationResponse> { return; }
 
   /**
    * Turn ON the background-geolocation system.
@@ -378,18 +377,14 @@ export class BackgroundGeolocation extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  start(): Promise<any> {
-    return;
-  }
+  start(): Promise<any> { return; }
 
   /**
    * Turn OFF background-tracking
    * @returns {Promise<any>}
    */
   @Cordova()
-  stop(): Promise<any> {
-    return;
-  }
+  stop(): Promise<any> { return; }
 
   /**
    * Inform the native plugin that you're finished, the background-task may be completed
@@ -398,9 +393,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  finish(): Promise<any> {
-    return;
-  }
+  finish(): Promise<any> { return; }
 
   /**
    * Force the plugin to enter "moving" or "stationary" state
@@ -410,9 +403,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  changePace(isMoving: boolean): Promise<any> {
-    return;
-  }
+  changePace(isMoving: boolean): Promise<any> { return; }
 
   /**
    * Setup configuration
@@ -422,9 +413,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  setConfig(options: BackgroundGeolocationConfig): Promise<any> {
-    return;
-  }
+  setConfig(options: BackgroundGeolocationConfig): Promise<any> { return; }
 
   /**
    * Returns current stationaryLocation if available. null if not
@@ -433,9 +422,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  getStationaryLocation(): Promise<BackgroundGeolocationResponse> {
-    return;
-  }
+  getStationaryLocation(): Promise<BackgroundGeolocationResponse> { return; }
 
   /**
    * Add a stationary-region listener. Whenever the devices enters "stationary-mode",
@@ -445,9 +432,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  onStationary(): Promise<any> {
-    return;
-  }
+  onStationary(): Promise<any> { return; }
 
   /**
    * Check if location is enabled on the device
@@ -456,21 +441,19 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  isLocationEnabled(): Promise<number> {
-    return;
-  }
+  isLocationEnabled(): Promise<number> { return; }
 
   /**
    * Display app settings to change permissions
    */
   @Cordova({ sync: true })
-  showAppSettings(): void {}
+  showAppSettings(): void { }
 
   /**
    * Display device location settings
    */
   @Cordova({ sync: true })
-  showLocationSettings(): void {}
+  showLocationSettings(): void { }
 
   /**
    * Method can be used to detect user changes in location services settings.
@@ -481,9 +464,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  watchLocationMode(): Promise<boolean> {
-    return;
-  }
+  watchLocationMode(): Promise<boolean> { return; }
 
   /**
    * Stop watching for location mode changes.
@@ -492,9 +473,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  stopWatchingLocationMode(): Promise<any> {
-    return;
-  }
+  stopWatchingLocationMode(): Promise<any> { return; }
 
   /**
    * Method will return all stored locations.
@@ -508,18 +487,14 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  getLocations(): Promise<any> {
-    return;
-  }
+  getLocations(): Promise<any> { return; }
 
-  /**
-   * Method will return locations, which has not been yet posted to server. NOTE: Locations does contain locationId.
+  /**

+   * Method will return locations, which has not been yet posted to server. NOTE: Locations does contain locationId.

    * @returns {Promise<any>}
    */
   @Cordova()
-  getValidLocations(): Promise<any> {
-    return;
-  }
+  getValidLocations(): Promise<any> { return; }
 
   /**
    * Delete stored location by given locationId.
@@ -529,9 +504,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  deleteLocation(locationId: number): Promise<any> {
-    return;
-  }
+  deleteLocation(locationId: number): Promise<any> { return; }
 
   /**
    * Delete all stored locations.
@@ -540,19 +513,17 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  deleteAllLocations(): Promise<any> {
-    return;
-  }
+  deleteAllLocations(): Promise<any> { return; }
 
   /**
    * Normally plugin will handle switching between BACKGROUND and FOREGROUND mode itself.
    * Calling switchMode you can override plugin behavior and force plugin to switch into other mode.
    *
    * In FOREGROUND mode plugin uses iOS local manager to receive locations and behavior is affected by option.desiredAccuracy and option.distanceFilter.
-   * In BACKGROUND mode plugin uses significant changes and region monitoring to receive locations and uses option.stationaryRadius only.
+   * In BACKGROUND mode plugin uses significant changes and region monitoring to receive locations and uses option.stationaryRadius only.

    *
    * BackgroundGeolocation.Mode.FOREGROUND
-   * BackgroundGeolocation.Mode.BACKGROUND
+   * BackgroundGeolocation.Mode.BACKGROUND

    **
    * @param modeId {number}
    * @returns {Promise<any>}
@@ -560,19 +531,16 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  switchMode(modeId: number): Promise<any> {
-    return;
-  }
+  switchMode(modeId: number): Promise<any> { return; }
 
-  /**
-   * Return all logged events. Useful for plugin debugging. Parameter limit limits number of returned entries.
-   * @see https://github.com/mauron85/cordova-plugin-background-geolocation/tree/v2.2.1#debugging for more information.
+  /**

+   * Return all logged events. Useful for plugin debugging. Parameter limit limits number of returned entries.

+   * @see https://github.com/mauron85/cordova-plugin-background-geolocation/tree/v2.2.1#debugging for more information.

    *
-   * @param limit {number} Limits the number of entries
+   * @param limit {number} Limits the number of entries

    * @returns {Promise<any>}
    */
   @Cordova()
-  getLogEntries(limit: number): Promise<any> {
-    return;
-  }
+  getLogEntries(limit: number): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/background-mode/index.ts b/src/@ionic-native/plugins/background-mode/index.ts
index 62b2ccdb5..2d353b7a1 100644
--- a/src/@ionic-native/plugins/background-mode/index.ts
+++ b/src/@ionic-native/plugins/background-mode/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
diff --git a/src/@ionic-native/plugins/backlight/index.ts b/src/@ionic-native/plugins/backlight/index.ts
index 6980995fe..ab9c638da 100644
--- a/src/@ionic-native/plugins/backlight/index.ts
+++ b/src/@ionic-native/plugins/backlight/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @beta
@@ -32,21 +33,19 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Backlight extends IonicNativePlugin {
+
   /**
    * This function turns backlight on
    * @return {Promise<any>} Returns a promise that resolves when the backlight is on
    */
   @Cordova()
-  on(): Promise<any> {
-    return;
-  }
+  on(): Promise<any> { return; }
 
   /**
    * This function turns backlight off
    * @return {Promise<any>} Returns a promise that resolves when the backlight is off
    */
   @Cordova()
-  off(): Promise<any> {
-    return;
-  }
+  off(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/badge/index.ts b/src/@ionic-native/plugins/badge/index.ts
index 53eb5b530..eb4828fe5 100644
--- a/src/@ionic-native/plugins/badge/index.ts
+++ b/src/@ionic-native/plugins/badge/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Badge
diff --git a/src/@ionic-native/plugins/base64/index.ts b/src/@ionic-native/plugins/base64/index.ts
index ed09b48b8..c43fda67d 100644
--- a/src/@ionic-native/plugins/base64/index.ts
+++ b/src/@ionic-native/plugins/base64/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @beta
@@ -33,13 +33,13 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Base64 extends IonicNativePlugin {
+
   /**
    * This function encodes base64 of any file
    * @param {string} filePath Absolute file path
    * @return {Promise<string>} Returns a promise that resolves when the file is successfully encoded
    */
   @Cordova()
-  encodeFile(filePath: string): Promise<string> {
-    return;
-  }
+  encodeFile(filePath: string): Promise<string> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/bluetooth-serial/index.ts b/src/@ionic-native/plugins/bluetooth-serial/index.ts
index 74d67e4a2..7dfaeedff 100644
--- a/src/@ionic-native/plugins/bluetooth-serial/index.ts
+++ b/src/@ionic-native/plugins/bluetooth-serial/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -39,6 +39,7 @@ import { Observable } from 'rxjs/Observable';
 })
 @Injectable()
 export class BluetoothSerial extends IonicNativePlugin {
+
   /**
    * Connect to a Bluetooth device
    * @param {string} macAddress_or_uuid Identifier of the remote device
@@ -49,9 +50,7 @@ export class BluetoothSerial extends IonicNativePlugin {
     observable: true,
     clearFunction: 'disconnect'
   })
-  connect(macAddress_or_uuid: string): Observable<any> {
-    return;
-  }
+  connect(macAddress_or_uuid: string): Observable<any> { return; }
 
   /**
    * Connect insecurely to a Bluetooth device
@@ -63,18 +62,14 @@ export class BluetoothSerial extends IonicNativePlugin {
     observable: true,
     clearFunction: 'disconnect'
   })
-  connectInsecure(macAddress: string): Observable<any> {
-    return;
-  }
+  connectInsecure(macAddress: string): Observable<any> { return; }
 
   /**
    * Disconnect from the connected device
    * @returns {Promise<any>}
    */
   @Cordova()
-  disconnect(): Promise<any> {
-    return;
-  }
+  disconnect(): Promise<any> { return; }
 
   /**
    * Writes data to the serial port
@@ -84,9 +79,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  write(data: any): Promise<any> {
-    return;
-  }
+  write(data: any): Promise<any> { return; }
 
   /**
    * Gets the number of bytes of data available
@@ -94,10 +87,7 @@ export class BluetoothSerial extends IonicNativePlugin {
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
-  })
-  available(): Promise<any> {
-    return;
-  }
+  }) available(): Promise<any> { return; }
 
   /**
    * Reads data from the buffer
@@ -106,9 +96,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  read(): Promise<any> {
-    return;
-  }
+  read(): Promise<any> { return; }
 
   /**
    * Reads data from the buffer until it reaches a delimiter
@@ -118,9 +106,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  readUntil(delimiter: string): Promise<any> {
-    return;
-  }
+  readUntil(delimiter: string): Promise<any> { return; }
 
   /**
    * Subscribe to be notified when data is received
@@ -132,9 +118,7 @@ export class BluetoothSerial extends IonicNativePlugin {
     observable: true,
     clearFunction: 'unsubscribe'
   })
-  subscribe(delimiter: string): Observable<any> {
-    return;
-  }
+  subscribe(delimiter: string): Observable<any> { return; }
 
   /**
    * Subscribe to be notified when data is received
@@ -145,9 +129,7 @@ export class BluetoothSerial extends IonicNativePlugin {
     observable: true,
     clearFunction: 'unsubscribeRawData'
   })
-  subscribeRawData(): Observable<any> {
-    return;
-  }
+  subscribeRawData(): Observable<any> { return; }
 
   /**
    * Clears data in buffer
@@ -156,9 +138,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  clear(): Promise<any> {
-    return;
-  }
+  clear(): Promise<any> { return; }
 
   /**
    * Lists bonded devices
@@ -167,9 +147,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  list(): Promise<any> {
-    return;
-  }
+  list(): Promise<any> { return; }
 
   /**
    * Reports if bluetooth is enabled
@@ -178,9 +156,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  isEnabled(): Promise<any> {
-    return;
-  }
+  isEnabled(): Promise<any> { return; }
 
   /**
    * Reports the connection status
@@ -189,9 +165,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  isConnected(): Promise<any> {
-    return;
-  }
+  isConnected(): Promise<any> { return; }
 
   /**
    * Reads the RSSI from the connected peripheral
@@ -200,9 +174,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  readRSSI(): Promise<any> {
-    return;
-  }
+  readRSSI(): Promise<any> { return; }
 
   /**
    * Show the Bluetooth settings on the device
@@ -211,9 +183,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  showBluetoothSettings(): Promise<any> {
-    return;
-  }
+  showBluetoothSettings(): Promise<any> { return; }
 
   /**
    * Enable Bluetooth on the device
@@ -222,9 +192,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  enable(): Promise<any> {
-    return;
-  }
+  enable(): Promise<any> { return; }
 
   /**
    * Discover unpaired devices
@@ -233,9 +201,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  discoverUnpaired(): Promise<any> {
-    return;
-  }
+  discoverUnpaired(): Promise<any> { return; }
 
   /**
    * Subscribe to be notified on Bluetooth device discovery. Discovery process must be initiated with the `discoverUnpaired` function.
@@ -246,9 +212,7 @@ export class BluetoothSerial extends IonicNativePlugin {
     observable: true,
     clearFunction: 'clearDeviceDiscoveredListener'
   })
-  setDeviceDiscoveredListener(): Observable<any> {
-    return;
-  }
+  setDeviceDiscoveredListener(): Observable<any> { return; }
 
   /**
    * Sets the human readable device name that is broadcasted to other devices
@@ -258,7 +222,7 @@ export class BluetoothSerial extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  setName(newName: string): void {}
+  setName(newName: string): void { }
 
   /**
    * Makes the device discoverable by other devices
@@ -268,5 +232,6 @@ export class BluetoothSerial extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  setDiscoverable(discoverableDuration: number): void {}
+  setDiscoverable(discoverableDuration: number): void { }
+
 }
diff --git a/src/@ionic-native/plugins/braintree/index.ts b/src/@ionic-native/plugins/braintree/index.ts
index 4ab1f9c88..dd805ff9c 100644
--- a/src/@ionic-native/plugins/braintree/index.ts
+++ b/src/@ionic-native/plugins/braintree/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * Options for the setupApplePay method.
@@ -116,7 +116,8 @@ export interface PaymentUIResult {
   /**
    * Information about the Apple Pay card used to complete a payment (if Apple Pay was used).
    */
-  applePaycard: {};
+  applePaycard: {
+  };
 
   /**
    * Information about 3D Secure card used to complete a payment (if 3D Secure was used).
@@ -200,12 +201,12 @@ export interface PaymentUIResult {
   pluginRef: 'BraintreePlugin',
   repo: 'https://github.com/taracque/cordova-plugin-braintree',
   platforms: ['Android', 'iOS'],
-  install:
-    'ionic cordova plugin add https://github.com/taracque/cordova-plugin-braintree',
-  installVariables: []
+  install: 'ionic cordova plugin add https://github.com/taracque/cordova-plugin-braintree',
+  installVariables: [],
 })
 @Injectable()
 export class Braintree extends IonicNativePlugin {
+
   /**
    * Used to initialize the Braintree client. This function must be called before other methods can be used.
    *  As the initialize code is async, be sure you call all Braintree related methods after the initialize promise has resolved.
@@ -214,11 +215,9 @@ export class Braintree extends IonicNativePlugin {
    * @return {Promise<undefined | string>} Returns a promise that resolves with undefined on successful initialization, or rejects with a string message describing the failure.
    */
   @Cordova({
-    platforms: ['Android', 'iOS']
+    platforms: ['Android', 'iOS'],
   })
-  initialize(token: string): Promise<undefined | string> {
-    return;
-  }
+  initialize(token: string): Promise<undefined | string> { return; }
 
   /**
    * Used to configure Apple Pay on iOS.
@@ -233,11 +232,9 @@ export class Braintree extends IonicNativePlugin {
    * @return {Promise<undefined | string>} Returns a promise that resolves with undefined on successful initialization, or rejects with a string message describing the failure.
    */
   @Cordova({
-    platforms: ['iOS']
+    platforms: ['iOS'],
   })
-  setupApplePay(options: ApplePayOptions): Promise<undefined | string> {
-    return;
-  }
+  setupApplePay(options: ApplePayOptions): Promise<undefined | string> { return; }
 
   /**
    * Shows Braintree's Drop-In Payments UI.
@@ -247,11 +244,7 @@ export class Braintree extends IonicNativePlugin {
    * @return {Promise<PaymentUIResult | string>} Returns a promise that resolves with a PaymentUIResult object on successful payment (or the user cancels), or rejects with a string message describing the failure.
    */
   @Cordova({
-    platforms: ['Android', 'iOS']
+    platforms: ['Android', 'iOS'],
   })
-  presentDropInPaymentUI(
-    options?: PaymentUIOptions
-  ): Promise<PaymentUIResult | string> {
-    return;
-  }
+  presentDropInPaymentUI(options?: PaymentUIOptions): Promise<PaymentUIResult | string> { return; }
 }
diff --git a/src/@ionic-native/plugins/broadcaster/index.ts b/src/@ionic-native/plugins/broadcaster/index.ts
index 2d895a204..8aabbb902 100644
--- a/src/@ionic-native/plugins/broadcaster/index.ts
+++ b/src/@ionic-native/plugins/broadcaster/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -32,6 +32,7 @@ import { Observable } from 'rxjs/Observable';
 })
 @Injectable()
 export class Broadcaster extends IonicNativePlugin {
+
   /**
    * This function listen to an event sent from the native code
    * @param eventName {string}
@@ -42,9 +43,7 @@ export class Broadcaster extends IonicNativePlugin {
     clearFunction: 'removeEventListener',
     clearWithArgs: true
   })
-  addEventListener(eventName: string): Observable<any> {
-    return;
-  }
+  addEventListener(eventName: string): Observable<any> { return; }
 
   /**
    * This function sends data to the native code
@@ -53,7 +52,6 @@ export class Broadcaster extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when an event is successfully fired
    */
   @Cordova()
-  fireNativeEvent(eventName: string, eventData: any): Promise<any> {
-    return;
-  }
+  fireNativeEvent(eventName: string, eventData: any): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/browser-tab/index.ts b/src/@ionic-native/plugins/browser-tab/index.ts
index e85e3dc2c..d41848c07 100644
--- a/src/@ionic-native/plugins/browser-tab/index.ts
+++ b/src/@ionic-native/plugins/browser-tab/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Browser Tab
@@ -41,14 +41,13 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class BrowserTab extends IonicNativePlugin {
+
   /**
    * Check if BrowserTab option is available
    * @return {Promise<any>} Returns a promise that resolves when check is successful and returns true or false
    */
   @Cordova()
-  isAvailable(): Promise<any> {
-    return;
-  }
+  isAvailable(): Promise<any> { return; }
 
   /**
    * Opens the provided URL using a browser tab
@@ -56,16 +55,12 @@ export class BrowserTab extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when check open was successful
    */
   @Cordova()
-  openUrl(url: string): Promise<any> {
-    return;
-  }
+  openUrl(url: string): Promise<any> { return; }
 
   /**
    * Closes browser tab
    * @return {Promise<any>} Returns a promise that resolves when close was finished
    */
   @Cordova()
-  close(): Promise<any> {
-    return;
-  }
+  close(): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/camera-preview/index.ts b/src/@ionic-native/plugins/camera-preview/index.ts
index f783a2d78..4545d9635 100644
--- a/src/@ionic-native/plugins/camera-preview/index.ts
+++ b/src/@ionic-native/plugins/camera-preview/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CameraPreviewDimensions {
   /** The width of the camera preview, default to window.screen.width */
@@ -131,12 +131,12 @@ export interface CameraPreviewPictureOptions {
   pluginName: 'CameraPreview',
   plugin: 'cordova-plugin-camera-preview',
   pluginRef: 'CameraPreview',
-  repo:
-    'https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview',
+  repo: 'https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview',
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class CameraPreview extends IonicNativePlugin {
+
   FOCUS_MODE = {
     FIXED: 'fixed',
     AUTO: 'auto',
@@ -189,45 +189,35 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  startCamera(options: CameraPreviewOptions): Promise<any> {
-    return;
-  }
+  startCamera(options: CameraPreviewOptions): Promise<any> { return; }
 
   /**
    * Stops the camera preview instance. (iOS & Android)
    * @return {Promise<any>}
    */
   @Cordova()
-  stopCamera(): Promise<any> {
-    return;
-  }
+  stopCamera(): Promise<any> { return; }
 
   /**
    * Switch from the rear camera and front camera, if available.
    * @return {Promise<any>}
    */
   @Cordova()
-  switchCamera(): Promise<any> {
-    return;
-  }
+  switchCamera(): Promise<any> { return; }
 
   /**
    * Hide the camera preview box.
    * @return {Promise<any>}
    */
   @Cordova()
-  hide(): Promise<any> {
-    return;
-  }
+  hide(): Promise<any> { return; }
 
   /**
    * Show the camera preview box.
    * @return {Promise<any>}
    */
   @Cordova()
-  show(): Promise<any> {
-    return;
-  }
+  show(): Promise<any> { return; }
 
   /**
    * Take the picture (base64)
@@ -238,9 +228,7 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  takePicture(options?: CameraPreviewPictureOptions): Promise<any> {
-    return;
-  }
+  takePicture(options?: CameraPreviewPictureOptions): Promise<any> { return; }
 
   /**
    *
@@ -253,9 +241,7 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setColorEffect(effect: string): Promise<any> {
-    return;
-  }
+  setColorEffect(effect: string): Promise<any> { return; }
 
   /**
    * Set the zoom (Android)
@@ -266,27 +252,21 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setZoom(zoom?: number): Promise<any> {
-    return;
-  }
+  setZoom(zoom?: number): Promise<any> { return; }
 
   /**
-   * Get the maximum zoom (Android)
-   * @return {Promise<any>}
-   */
+     * Get the maximum zoom (Android)
+     * @return {Promise<any>}
+     */
   @Cordova()
-  getMaxZoom(): Promise<any> {
-    return;
-  }
+  getMaxZoom(): Promise<any> { return; }
 
   /**
    * Get current zoom (Android)
    * @return {Promise<any>}
    */
   @Cordova()
-  getZoom(): Promise<any> {
-    return;
-  }
+  getZoom(): Promise<any> { return; }
 
   /**
    * Set the preview Size
@@ -297,18 +277,14 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setPreviewSize(dimensions?: CameraPreviewDimensions): Promise<any> {
-    return;
-  }
+  setPreviewSize(dimensions?: CameraPreviewDimensions): Promise<any> { return; }
 
   /**
    * Get focus mode
    * @return {Promise<any>}
    */
   @Cordova()
-  getFocusMode(): Promise<any> {
-    return;
-  }
+  getFocusMode(): Promise<any> { return; }
 
   /**
    * Set the focus mode
@@ -319,27 +295,21 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setFocusMode(focusMode?: string): Promise<any> {
-    return;
-  }
+  setFocusMode(focusMode?: string): Promise<any> { return; }
 
   /**
    * Get supported focus modes
    * @return {Promise<any>}
    */
   @Cordova()
-  getSupportedFocusModes(): Promise<any> {
-    return;
-  }
+  getSupportedFocusModes(): Promise<any> { return; }
 
   /**
    * Get the current flash mode
    * @return {Promise<any>}
    */
   @Cordova()
-  getFlashMode(): Promise<any> {
-    return;
-  }
+  getFlashMode(): Promise<any> { return; }
 
   /**
    * Set the flashmode
@@ -350,45 +320,35 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setFlashMode(flashMode?: string): Promise<any> {
-    return;
-  }
+  setFlashMode(flashMode?: string): Promise<any> { return; }
 
   /**
    * Get supported flash modes
    * @return {Promise<any>}
    */
   @Cordova()
-  getSupportedFlashModes(): Promise<any> {
-    return;
-  }
+  getSupportedFlashModes(): Promise<any> { return; }
 
   /**
    * Get supported picture sizes
    * @return {Promise<any>}
    */
   @Cordova()
-  getSupportedPictureSizes(): Promise<any> {
-    return;
-  }
+  getSupportedPictureSizes(): Promise<any> { return; }
 
   /**
    * Get exposure mode
    * @return {Promise<any>}
    */
   @Cordova()
-  getExposureMode(): Promise<any> {
-    return;
-  }
+  getExposureMode(): Promise<any> { return; }
 
   /**
    * Get exposure modes
    * @return {Promise<any>}
    */
   @Cordova()
-  getExposureModes(): Promise<any> {
-    return;
-  }
+  getExposureModes(): Promise<any> { return; }
 
   /**
    * Set exposure mode
@@ -399,18 +359,14 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setExposureMode(lock?: string): Promise<any> {
-    return;
-  }
+  setExposureMode(lock?: string): Promise<any> { return; }
 
   /**
    * Get exposure compensation (Android)
    * @return {Promise<any>}
    */
   @Cordova()
-  getExposureCompensation(): Promise<any> {
-    return;
-  }
+  getExposureCompensation(): Promise<any> { return; }
 
   /**
    * Set exposure compensation (Android)
@@ -421,18 +377,14 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setExposureCompensation(exposureCompensation?: number): Promise<any> {
-    return;
-  }
+  setExposureCompensation(exposureCompensation?: number): Promise<any> { return; }
 
   /**
    * Get exposure compensation range (Android)
    * @return {Promise<any>}
    */
   @Cordova()
-  getExposureCompensationRange(): Promise<any> {
-    return;
-  }
+  getExposureCompensationRange(): Promise<any> { return; }
 
   /**
    * Set specific focus point. Note, this assumes the camera is full-screen.
@@ -441,7 +393,6 @@ export class CameraPreview extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  tapToFocus(xPoint: number, yPoint: number): Promise<any> {
-    return;
-  }
+  tapToFocus(xPoint: number, yPoint: number): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/camera/index.ts b/src/@ionic-native/plugins/camera/index.ts
index ddb0a02d5..5afb20219 100644
--- a/src/@ionic-native/plugins/camera/index.ts
+++ b/src/@ionic-native/plugins/camera/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CameraOptions {
   /** Picture quality in range 0-100. Default is 50 */
@@ -33,7 +33,7 @@ export interface CameraOptions {
   /**
    * Width in pixels to scale image. Must be used with targetHeight.
    * Aspect ratio remains constant.
-   */
+  */
   targetWidth?: number;
   /**
    * Height in pixels to scale image. Must be used with targetWidth.
@@ -165,6 +165,7 @@ export enum Direction {
 })
 @Injectable()
 export class Camera extends IonicNativePlugin {
+
   /**
    * Constant for possible destination types
    */
@@ -199,6 +200,7 @@ export class Camera extends IonicNativePlugin {
     ALLMEDIA: 2
   };
 
+
   /**
    * Convenience constant
    */
@@ -211,6 +213,7 @@ export class Camera extends IonicNativePlugin {
     SAVEDPHOTOALBUM: 2
   };
 
+
   /**
    * Convenience constant
    */
@@ -240,9 +243,7 @@ export class Camera extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getPicture(options?: CameraOptions): Promise<any> {
-    return;
-  }
+  getPicture(options?: CameraOptions): Promise<any> { return; }
 
   /**
    * Remove intermediate image files that are kept in temporary storage after calling camera.getPicture.
@@ -252,7 +253,6 @@ export class Camera extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  cleanup(): Promise<any> {
-    return;
-  }
+  cleanup(): Promise<any> { return; };
+
 }
diff --git a/src/@ionic-native/plugins/card-io/index.ts b/src/@ionic-native/plugins/card-io/index.ts
index 4fccf4a15..5d96b76e5 100644
--- a/src/@ionic-native/plugins/card-io/index.ts
+++ b/src/@ionic-native/plugins/card-io/index.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CardIOOptions {
+
   /**
    * Set to true to require expiry date
    */
@@ -81,9 +82,11 @@ export interface CardIOOptions {
    * Once a card image has been captured but before it has been processed, this value will determine whether to continue processing as usual.
    */
   supressScan?: boolean;
+
 }
 
 export interface CardIOResponse {
+
   /**
    * Card type
    */
@@ -123,6 +126,7 @@ export interface CardIOResponse {
    * Cardholder name
    */
   cardholderName: string;
+
 }
 
 /**
@@ -169,6 +173,7 @@ export interface CardIOResponse {
 })
 @Injectable()
 export class CardIO extends IonicNativePlugin {
+
   /**
    * Check whether card scanning is currently available. (May vary by
    * device, OS version, network connectivity, etc.)
@@ -176,9 +181,7 @@ export class CardIO extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  canScan(): Promise<boolean> {
-    return;
-  }
+  canScan(): Promise<boolean> { return; }
 
   /**
    * Scan a credit card with card.io.
@@ -186,16 +189,13 @@ export class CardIO extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  scan(options?: CardIOOptions): Promise<CardIOResponse> {
-    return;
-  }
+  scan(options?: CardIOOptions): Promise<CardIOResponse> { return; }
 
   /**
    * Retrieve the version of the card.io library. Useful when contacting support.
    * @returns {Promise<string>}
    */
   @Cordova()
-  version(): Promise<string> {
-    return;
-  }
+  version(): Promise<string> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/clipboard/index.ts b/src/@ionic-native/plugins/clipboard/index.ts
index ce3b0900c..1070bf6da 100644
--- a/src/@ionic-native/plugins/clipboard/index.ts
+++ b/src/@ionic-native/plugins/clipboard/index.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 /**
  * @name Clipboard
  * @description
@@ -37,22 +36,20 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Clipboard extends IonicNativePlugin {
+
   /**
    * Copies the given text
    * @param {string} text Text that gets copied on the system clipboard
    * @returns {Promise<any>} Returns a promise after the text has been copied
    */
   @Cordova()
-  copy(text: string): Promise<any> {
-    return;
-  }
+  copy(text: string): Promise<any> { return; }
 
   /**
    * Pastes the text stored in clipboard
    * @returns {Promise<any>} Returns a promise after the text has been pasted
    */
   @Cordova()
-  paste(): Promise<any> {
-    return;
-  }
+  paste(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/code-push/index.ts b/src/@ionic-native/plugins/code-push/index.ts
index b446cde2f..6db99ce70 100644
--- a/src/@ionic-native/plugins/code-push/index.ts
+++ b/src/@ionic-native/plugins/code-push/index.ts
@@ -1,18 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
-
 namespace Http {
   export const enum Verb {
-    GET,
-    HEAD,
-    POST,
-    PUT,
-    DELETE,
-    TRACE,
-    OPTIONS,
-    CONNECT,
-    PATCH
+    GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH
   }
 
   export interface Response {
@@ -22,12 +13,7 @@ namespace Http {
 
   export interface Requester {
     request(verb: Verb, url: string, callback: Callback<Response>): void;
-    request(
-      verb: Verb,
-      url: string,
-      requestBody: string,
-      callback: Callback<Response>
-    ): void;
+    request(verb: Verb, url: string, requestBody: string, callback: Callback<Response>): void;
   }
 }
 
@@ -64,11 +50,7 @@ export interface IRemotePackage extends IPackage {
    * @param downloadError Optional callback invoked in case of an error.
    * @param downloadProgress Optional callback invoked during the download process. It is called several times with one DownloadProgress parameter.
    */
-  download(
-    downloadSuccess: SuccessCallback<ILocalPackage>,
-    downloadError?: ErrorCallback,
-    downloadProgress?: SuccessCallback<DownloadProgress>
-  ): void;
+  download(downloadSuccess: SuccessCallback<ILocalPackage>, downloadError?: ErrorCallback, downloadProgress?: SuccessCallback<DownloadProgress>): void;
 
   /**
    * Aborts the current download session, previously started with download().
@@ -76,10 +58,7 @@ export interface IRemotePackage extends IPackage {
    * @param abortSuccess Optional callback invoked if the abort operation succeeded.
    * @param abortError Optional callback invoked in case of an error.
    */
-  abortDownload(
-    abortSuccess?: SuccessCallback<void>,
-    abortError?: ErrorCallback
-  ): void;
+  abortDownload(abortSuccess?: SuccessCallback<void>, abortError?: ErrorCallback): void;
 }
 
 /**
@@ -107,11 +86,7 @@ export interface ILocalPackage extends IPackage {
    * @param installError Optional callback inovoked in case of an error.
    * @param installOptions Optional parameter used for customizing the installation behavior.
    */
-  install(
-    installSuccess: SuccessCallback<InstallMode>,
-    errorCallback?: ErrorCallback,
-    installOptions?: InstallOptions
-  ): void;
+  install(installSuccess: SuccessCallback<InstallMode>, errorCallback?: ErrorCallback, installOptions?: InstallOptions): void;
 }
 
 /**
@@ -148,19 +123,13 @@ interface IPackageInfoMetadata extends ILocalPackage {
 }
 
 interface NativeUpdateNotification {
-  updateAppVersion: boolean; // Always true
+  updateAppVersion: boolean;   // Always true
   appVersion: string;
 }
 
-export interface Callback<T> {
-  (error: Error, parameter: T): void;
-}
-export interface SuccessCallback<T> {
-  (result?: T): void;
-}
-export interface ErrorCallback {
-  (error?: Error): void;
-}
+export interface Callback<T> { (error: Error, parameter: T): void; }
+export interface SuccessCallback<T> { (result?: T): void; }
+export interface ErrorCallback { (error?: Error): void; }
 
 interface Configuration {
   appVersion: string;
@@ -177,40 +146,26 @@ declare class AcquisitionStatus {
 
 declare class AcquisitionManager {
   constructor(httpRequester: Http.Requester, configuration: Configuration);
-  public queryUpdateWithCurrentPackage(
-    currentPackage: IPackage,
-    callback?: Callback<IRemotePackage | NativeUpdateNotification>
-  ): void;
-  public reportStatusDeploy(
-    pkg?: IPackage,
-    status?: string,
-    previousLabelOrAppVersion?: string,
-    previousDeploymentKey?: string,
-    callback?: Callback<void>
-  ): void;
+  public queryUpdateWithCurrentPackage(currentPackage: IPackage, callback?: Callback<IRemotePackage | NativeUpdateNotification>): void;
+  public reportStatusDeploy(pkg?: IPackage, status?: string, previousLabelOrAppVersion?: string, previousDeploymentKey?: string, callback?: Callback<void>): void;
   public reportStatusDownload(pkg: IPackage, callback?: Callback<void>): void;
 }
 
 interface CodePushCordovaPlugin {
+
   /**
    * Get the current package information.
    *
    * @param packageSuccess Callback invoked with the currently deployed package information.
    * @param packageError Optional callback invoked in case of an error.
    */
-  getCurrentPackage(
-    packageSuccess: SuccessCallback<ILocalPackage>,
-    packageError?: ErrorCallback
-  ): void;
+  getCurrentPackage(packageSuccess: SuccessCallback<ILocalPackage>, packageError?: ErrorCallback): void;
 
   /**
    * Gets the pending package information, if any. A pending package is one that has been installed but the application still runs the old code.
    * This happends only after a package has been installed using ON_NEXT_RESTART or ON_NEXT_RESUME mode, but the application was not restarted/resumed yet.
    */
-  getPendingPackage(
-    packageSuccess: SuccessCallback<ILocalPackage>,
-    packageError?: ErrorCallback
-  ): void;
+  getPendingPackage(packageSuccess: SuccessCallback<ILocalPackage>, packageError?: ErrorCallback): void;
 
   /**
    * Checks with the CodePush server if an update package is available for download.
@@ -221,11 +176,7 @@ interface CodePushCordovaPlugin {
    * @param queryError Optional callback invoked in case of an error.
    * @param deploymentKey Optional deployment key that overrides the config.xml setting.
    */
-  checkForUpdate(
-    querySuccess: SuccessCallback<IRemotePackage>,
-    queryError?: ErrorCallback,
-    deploymentKey?: string
-  ): void;
+  checkForUpdate(querySuccess: SuccessCallback<IRemotePackage>, queryError?: ErrorCallback, deploymentKey?: string): void;
 
   /**
    * Notifies the plugin that the update operation succeeded and that the application is ready.
@@ -235,19 +186,13 @@ interface CodePushCordovaPlugin {
    * @param notifySucceeded Optional callback invoked if the plugin was successfully notified.
    * @param notifyFailed Optional callback invoked in case of an error during notifying the plugin.
    */
-  notifyApplicationReady(
-    notifySucceeded?: SuccessCallback<void>,
-    notifyFailed?: ErrorCallback
-  ): void;
+  notifyApplicationReady(notifySucceeded?: SuccessCallback<void>, notifyFailed?: ErrorCallback): void;
 
   /**
    * Reloads the application. If there is a pending update package installed using ON_NEXT_RESTART or ON_NEXT_RESUME modes, the update
    * will be immediately visible to the user. Otherwise, calling this function will simply reload the current version of the application.
    */
-  restartApplication(
-    installSuccess: SuccessCallback<void>,
-    errorCallback?: ErrorCallback
-  ): void;
+  restartApplication(installSuccess: SuccessCallback<void>, errorCallback?: ErrorCallback): void;
 
   /**
    * Convenience method for installing updates in one method call.
@@ -270,11 +215,7 @@ interface CodePushCordovaPlugin {
    * @param downloadProgress Optional callback invoked during the download process. It is called several times with one DownloadProgress parameter.
    *
    */
-  sync(
-    syncCallback?: SuccessCallback<SyncStatus>,
-    syncOptions?: SyncOptions,
-    downloadProgress?: SuccessCallback<DownloadProgress>
-  ): void;
+  sync(syncCallback?: SuccessCallback<SyncStatus>, syncOptions?: SyncOptions, downloadProgress?: SuccessCallback<DownloadProgress>): void;
 }
 
 /**
@@ -487,6 +428,7 @@ export interface DownloadProgress {
 })
 @Injectable()
 export class CodePush extends IonicNativePlugin {
+
   /**
    * Get the current package information.
    *
@@ -576,10 +518,8 @@ export class CodePush extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 3 // we don't need this, so we set it to a value higher than # of args
   })
-  sync(
-    syncOptions?: SyncOptions,
-    downloadProgress?: SuccessCallback<DownloadProgress>
-  ): Observable<SyncStatus> {
+  sync(syncOptions?: SyncOptions, downloadProgress?: SuccessCallback<DownloadProgress>): Observable<SyncStatus> {
     return;
   }
+
 }
diff --git a/src/@ionic-native/plugins/contacts/index.ts b/src/@ionic-native/plugins/contacts/index.ts
index b52c2e416..495703233 100644
--- a/src/@ionic-native/plugins/contacts/index.ts
+++ b/src/@ionic-native/plugins/contacts/index.ts
@@ -1,47 +1,12 @@
-import {
-  checkAvailability,
-  CordovaCheck,
-  CordovaInstance,
-  getPromise,
-  InstanceCheck,
-  InstanceProperty,
-  IonicNativePlugin,
-  Plugin,
-} from '@ionic-native/core';
+import { CordovaInstance, InstanceProperty, Plugin, getPromise, InstanceCheck, checkAvailability, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 
-declare const window: any, navigator: any;
+declare const window: any,
+  navigator: any;
 
-export type ContactFieldType =
-  | '*'
-  | 'addresses'
-  | 'birthday'
-  | 'categories'
-  | 'country'
-  | 'department'
-  | 'displayName'
-  | 'emails'
-  | 'name.familyName'
-  | 'name.formatted'
-  | 'name.givenName'
-  | 'name.honorificPrefix'
-  | 'name.honorificSuffix'
-  | 'id'
-  | 'ims'
-  | 'locality'
-  | 'name.middleName'
-  | 'name'
-  | 'nickname'
-  | 'note'
-  | 'organizations'
-  | 'phoneNumbers'
-  | 'photos'
-  | 'postalCode'
-  | 'region'
-  | 'streetAddress'
-  | 'title'
-  | 'urls';
+export type ContactFieldType = '*' | 'addresses' | 'birthday' | 'categories' | 'country' | 'department' | 'displayName' | 'emails' | 'name.familyName' | 'name.formatted' | 'name.givenName' | 'name.honorificPrefix' | 'name.honorificSuffix' | 'id' | 'ims' | 'locality' | 'name.middleName' | 'name' | 'nickname' | 'note' | 'organizations' | 'phoneNumbers' | 'photos' | 'postalCode' | 'region' | 'streetAddress' | 'title' | 'urls';
 
 export interface IContactProperties {
+
   /** A globally unique identifier. */
   id?: string;
 
@@ -83,6 +48,7 @@ export interface IContactProperties {
 
   /** An array of web pages associated with the contact. */
   urls?: IContactField[];
+
 }
 
 /**
@@ -108,9 +74,7 @@ export class Contact implements IContactProperties {
   [key: string]: any;
 
   constructor() {
-    if (
-      checkAvailability('navigator.contacts', 'create', 'Contacts') === true
-    ) {
+    if (checkAvailability('navigator.contacts', 'create', 'Contacts') === true) {
       this._objectInstance = navigator.contacts.create();
     }
   }
@@ -126,9 +90,7 @@ export class Contact implements IContactProperties {
   }
 
   @CordovaInstance()
-  remove(): Promise<any> {
-    return;
-  }
+  remove(): Promise<any> { return; }
 
   @InstanceCheck()
   save(): Promise<any> {
@@ -162,7 +124,7 @@ export declare const ContactError: {
   PENDING_OPERATION_ERROR: number;
   IO_ERROR: number;
   NOT_SUPPORTED_ERROR: number;
-  PERMISSION_DENIED_ERROR: number;
+  PERMISSION_DENIED_ERROR: number
 };
 
 export interface IContactName {
@@ -184,14 +146,12 @@ export interface IContactName {
  * @hidden
  */
 export class ContactName implements IContactName {
-  constructor(
-    public formatted?: string,
+  constructor(public formatted?: string,
     public familyName?: string,
     public givenName?: string,
     public middleName?: string,
     public honorificPrefix?: string,
-    public honorificSuffix?: string
-  ) {}
+    public honorificSuffix?: string) { }
 }
 
 export interface IContactField {
@@ -207,11 +167,9 @@ export interface IContactField {
  * @hidden
  */
 export class ContactField implements IContactField {
-  constructor(
-    public type?: string,
+  constructor(public type?: string,
     public value?: string,
-    public pref?: boolean
-  ) {}
+    public pref?: boolean) { }
 }
 
 export interface IContactAddress {
@@ -237,16 +195,14 @@ export interface IContactAddress {
  * @hidden
  */
 export class ContactAddress implements IContactAddress {
-  constructor(
-    public pref?: boolean,
+  constructor(public pref?: boolean,
     public type?: string,
     public formatted?: string,
     public streetAddress?: string,
     public locality?: string,
     public region?: string,
     public postalCode?: string,
-    public country?: string
-  ) {}
+    public country?: string) { }
 }
 
 export interface IContactOrganization {
@@ -272,7 +228,7 @@ export class ContactOrganization implements IContactOrganization {
     public department?: string,
     public title?: string,
     public pref?: boolean
-  ) {}
+  ) { }
 }
 
 /** Search options to filter navigator.contacts.  */
@@ -293,12 +249,10 @@ export interface IContactFindOptions {
  * @hidden
  */
 export class ContactFindOptions implements IContactFindOptions {
-  constructor(
-    public filter?: string,
+  constructor(public filter?: string,
     public multiple?: boolean,
     public desiredFields?: string[],
-    public hasPhoneNumber?: boolean
-  ) {}
+    public hasPhoneNumber?: boolean) { }
 }
 
 /**
@@ -339,19 +293,10 @@ export class ContactFindOptions implements IContactFindOptions {
   plugin: 'cordova-plugin-contacts',
   pluginRef: 'navigator.contacts',
   repo: 'https://github.com/apache/cordova-plugin-contacts',
-  platforms: [
-    'Android',
-    'BlackBerry 10',
-    'Browser',
-    'Firefox OS',
-    'iOS',
-    'Ubuntu',
-    'Windows',
-    'Windows 8',
-    'Windows Phone'
-  ]
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows 8', 'Windows Phone']
 })
 export class Contacts extends IonicNativePlugin {
+
   /**
    * Create a single contact.
    * @returns {Contact} Returns a Contact object
@@ -367,19 +312,11 @@ export class Contacts extends IonicNativePlugin {
    * @returns {Promise<Contact[]>} Returns a Promise that resolves with the search results (an array of Contact objects)
    */
   @CordovaCheck()
-  find(
-    fields: ContactFieldType[],
-    options?: IContactFindOptions
-  ): Promise<Contact[]> {
+  find(fields: ContactFieldType[], options?: IContactFindOptions): Promise<Contact[]> {
     return getPromise((resolve: Function, reject: Function) => {
-      navigator.contacts.find(
-        fields,
-        (contacts: any[]) => {
-          resolve(contacts.map(processContact));
-        },
-        reject,
-        options
-      );
+      navigator.contacts.find(fields, (contacts: any[]) => {
+        resolve(contacts.map(processContact));
+      }, reject, options);
     });
   }
 
@@ -390,12 +327,10 @@ export class Contacts extends IonicNativePlugin {
   @CordovaCheck()
   pickContact(): Promise<Contact> {
     return getPromise((resolve: Function, reject: Function) => {
-      navigator.contacts.pickContact(
-        (contact: any) => resolve(processContact(contact)),
-        reject
-      );
+      navigator.contacts.pickContact((contact: any) => resolve(processContact(contact)), reject);
     });
   }
+
 }
 
 /**
diff --git a/src/@ionic-native/plugins/couchbase-lite/index.ts b/src/@ionic-native/plugins/couchbase-lite/index.ts
index e9be4a634..467a0e80b 100644
--- a/src/@ionic-native/plugins/couchbase-lite/index.ts
+++ b/src/@ionic-native/plugins/couchbase-lite/index.ts
@@ -1,5 +1,6 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
 
 /**
  * @name Couchbase Lite
@@ -65,8 +66,8 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
  *        .catch((error:any) => {
  *           return Observable.throw(error.json() || 'Couchbase Lite error');
  *        })        .
- * }
- * createDocument(database_name:string,document){
+ * }      
+ * createDocument(database_name:string,document){   
  *      let url = this.getUrl();
  *      url = url + database_name;
  *      return this._http
@@ -83,9 +84,9 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
  * createDocument('justbe', document);
  * // successful response
  * { "id": "string","rev": "string","ok": true }
- * updateDocument(database_name:string,document){
+ * updateDocument(database_name:string,document){    
  *      let url = this.getUrl();
- *      url = url + database_name + '/' + document._id;
+ *      url = url + database_name + '/' + document._id;     
  *      return this._http
  *        .put(url,document)
  *        .map(data => { this.results = data['results'] })
@@ -120,6 +121,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class CouchbaseLite extends IonicNativePlugin {
+
   /**
    * Get the database url
    * @return {Promise<any>} Returns a promise that resolves with the local database url
@@ -127,7 +129,6 @@ export class CouchbaseLite extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  getURL(): Promise<any> {
-    return;
-  }
+  getURL(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/crop/index.ts b/src/@ionic-native/plugins/crop/index.ts
index 8554f30f8..928675009 100644
--- a/src/@ionic-native/plugins/crop/index.ts
+++ b/src/@ionic-native/plugins/crop/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CropOptions {
   quality?: number;
diff --git a/src/@ionic-native/plugins/deeplinks/index.ts b/src/@ionic-native/plugins/deeplinks/index.ts
index 57596f6de..0b9519168 100644
--- a/src/@ionic-native/plugins/deeplinks/index.ts
+++ b/src/@ionic-native/plugins/deeplinks/index.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeeplinkMatch {
+
   /**
    * The route info for the matched route
    */
@@ -19,6 +20,7 @@ export interface DeeplinkMatch {
    * the route was matched (for example, Facebook sometimes adds extra data)
    */
   $link: any;
+
 }
 
 export interface DeeplinkOptions {
@@ -83,18 +85,13 @@ export interface DeeplinkOptions {
   plugin: 'ionic-plugin-deeplinks',
   pluginRef: 'IonicDeeplink',
   repo: 'https://github.com/ionic-team/ionic-plugin-deeplinks',
-  install:
-    'ionic cordova plugin add ionic-plugin-deeplinks --variable URL_SCHEME=myapp --variable DEEPLINK_SCHEME=https --variable DEEPLINK_HOST=example.com --variable ANDROID_PATH_PREFIX=/',
-  installVariables: [
-    'URL_SCHEME',
-    'DEEPLINK_SCHEME',
-    'DEEPLINK_HOST',
-    'ANDROID_PATH_PREFIX'
-  ],
+  install: 'ionic cordova plugin add ionic-plugin-deeplinks --variable URL_SCHEME=myapp --variable DEEPLINK_SCHEME=https --variable DEEPLINK_HOST=example.com --variable ANDROID_PATH_PREFIX=/',
+  installVariables: ['URL_SCHEME', 'DEEPLINK_SCHEME', 'DEEPLINK_HOST', 'ANDROID_PATH_PREFIX'],
   platforms: ['Android', 'Browser', 'iOS']
 })
 @Injectable()
 export class Deeplinks extends IonicNativePlugin {
+
   /**
    * Define a set of paths to match against incoming deeplinks.
    *
@@ -108,9 +105,7 @@ export class Deeplinks extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  route(paths: any): Observable<DeeplinkMatch> {
-    return;
-  }
+  route(paths: any): Observable<DeeplinkMatch> { return; }
 
   /**
    *
@@ -128,7 +123,7 @@ export class Deeplinks extends IonicNativePlugin {
    * promise result which you can then use to navigate in the app as you see fit.
    *
    * @param {Object} paths
-   *
+   * 
    * @param {DeeplinkOptions} options
    *
    * @returns {Observable<DeeplinkMatch>} Returns an Observable that resolves each time a deeplink comes through, and
@@ -137,11 +132,6 @@ export class Deeplinks extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  routeWithNavController(
-    navController: any,
-    paths: any,
-    options?: DeeplinkOptions
-  ): Observable<DeeplinkMatch> {
-    return;
-  }
+  routeWithNavController(navController: any, paths: any, options?: DeeplinkOptions): Observable<DeeplinkMatch> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/device-motion/index.ts b/src/@ionic-native/plugins/device-motion/index.ts
index c217ccd71..c29ec8be3 100644
--- a/src/@ionic-native/plugins/device-motion/index.ts
+++ b/src/@ionic-native/plugins/device-motion/index.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeviceMotionAccelerationData {
+
   /**
    * Amount of acceleration on the x-axis. (in m/s^2)
    */
@@ -22,13 +23,16 @@ export interface DeviceMotionAccelerationData {
    * Creation timestamp in milliseconds.
    */
   timestamp: any;
+
 }
 
 export interface DeviceMotionAccelerometerOptions {
+
   /**
    * Requested period of calls to accelerometerSuccess with acceleration data in Milliseconds. Default: 10000
    */
   frequency?: number;
+
 }
 
 /**
@@ -68,28 +72,17 @@ export interface DeviceMotionAccelerometerOptions {
   plugin: 'cordova-plugin-device-motion',
   pluginRef: 'navigator.accelerometer',
   repo: 'https://github.com/apache/cordova-plugin-device-motion',
-  platforms: [
-    'Android',
-    'BlackBerry 10',
-    'Browser',
-    'Firefox OS',
-    'iOS',
-    'Tizen',
-    'Ubuntu',
-    'Windows',
-    'Windows Phone 8'
-  ]
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone 8']
 })
 @Injectable()
 export class DeviceMotion extends IonicNativePlugin {
+
   /**
    * Get the current acceleration along the x, y, and z axes.
    * @returns {Promise<DeviceMotionAccelerationData>} Returns object with x, y, z, and timestamp properties
    */
   @Cordova()
-  getCurrentAcceleration(): Promise<DeviceMotionAccelerationData> {
-    return;
-  }
+  getCurrentAcceleration(): Promise<DeviceMotionAccelerationData> { return; }
 
   /**
    * Watch the device acceleration. Clear the watch by unsubscribing from the observable.
@@ -101,9 +94,6 @@ export class DeviceMotion extends IonicNativePlugin {
     observable: true,
     clearFunction: 'clearWatch'
   })
-  watchAcceleration(
-    options?: DeviceMotionAccelerometerOptions
-  ): Observable<DeviceMotionAccelerationData> {
-    return;
-  }
+  watchAcceleration(options?: DeviceMotionAccelerometerOptions): Observable<DeviceMotionAccelerationData> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/device-orientation/index.ts b/src/@ionic-native/plugins/device-orientation/index.ts
index fd5ed503c..ffd4e52aa 100644
--- a/src/@ionic-native/plugins/device-orientation/index.ts
+++ b/src/@ionic-native/plugins/device-orientation/index.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeviceOrientationCompassHeading {
+
   /**
    * The heading in degrees from 0-359.99 at a single moment in time. (Number)
    */
@@ -22,9 +23,11 @@ export interface DeviceOrientationCompassHeading {
    * The time at which this heading was determined. (DOMTimeStamp)
    */
   timestamp: number;
+
 }
 
 export interface DeviceOrientationCompassOptions {
+
   /**
    * How often to retrieve the compass heading in milliseconds. (Number) (Default: 100)
    */
@@ -34,6 +37,7 @@ export interface DeviceOrientationCompassOptions {
    * The change in degrees required to initiate a watchHeading success callback. When this value is set, frequency is ignored. (Number)
    */
   filter?: number;
+
 }
 
 /**
@@ -73,29 +77,17 @@ export interface DeviceOrientationCompassOptions {
   plugin: 'cordova-plugin-device-orientation',
   pluginRef: 'navigator.compass',
   repo: 'https://github.com/apache/cordova-plugin-device-orientation',
-  platforms: [
-    'Amazon Fire OS',
-    'Android',
-    'BlackBerry 10',
-    'Browser',
-    'Firefox OS',
-    'iOS',
-    'Tizen',
-    'Ubuntu',
-    'Windows',
-    'Windows Phone'
-  ]
+  platforms: ['Amazon Fire OS', 'Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
 export class DeviceOrientation extends IonicNativePlugin {
+
   /**
    * Get the current compass heading.
    * @returns {Promise<DeviceOrientationCompassHeading>}
    */
   @Cordova()
-  getCurrentHeading(): Promise<DeviceOrientationCompassHeading> {
-    return;
-  }
+  getCurrentHeading(): Promise<DeviceOrientationCompassHeading> { return; }
 
   /**
    * Get the device current heading at a regular interval
@@ -109,9 +101,6 @@ export class DeviceOrientation extends IonicNativePlugin {
     observable: true,
     clearFunction: 'clearWatch'
   })
-  watchHeading(
-    options?: DeviceOrientationCompassOptions
-  ): Observable<DeviceOrientationCompassHeading> {
-    return;
-  }
+  watchHeading(options?: DeviceOrientationCompassOptions): Observable<DeviceOrientationCompassHeading> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/device/index.ts b/src/@ionic-native/plugins/device/index.ts
index b6102ed32..8f2b4cd6a 100644
--- a/src/@ionic-native/plugins/device/index.ts
+++ b/src/@ionic-native/plugins/device/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 declare const window: any;
 
@@ -28,30 +28,40 @@ declare const window: any;
 })
 @Injectable()
 export class Device extends IonicNativePlugin {
+
   /** Get the version of Cordova running on the device. */
-  @CordovaProperty cordova: string;
+  @CordovaProperty
+  cordova: string;
 
   /**
    * The device.model returns the name of the device's model or product. The value is set
    * by the device manufacturer and may be different across versions of the same product.
    */
-  @CordovaProperty model: string;
+  @CordovaProperty
+  model: string;
 
   /** Get the device's operating system name. */
-  @CordovaProperty platform: string;
+  @CordovaProperty
+  platform: string;
 
   /** Get the device's Universally Unique Identifier (UUID). */
-  @CordovaProperty uuid: string;
+  @CordovaProperty
+  uuid: string;
 
   /** Get the operating system version. */
-  @CordovaProperty version: string;
+  @CordovaProperty
+  version: string;
 
   /** Get the device's manufacturer. */
-  @CordovaProperty manufacturer: string;
+  @CordovaProperty
+  manufacturer: string;
 
   /** Whether the device is running on a simulator. */
-  @CordovaProperty isVirtual: boolean;
+  @CordovaProperty
+  isVirtual: boolean;
 
   /** Get the device hardware serial number. */
-  @CordovaProperty serial: string;
+  @CordovaProperty
+  serial: string;
+
 }
diff --git a/src/@ionic-native/plugins/diagnostic/index.ts b/src/@ionic-native/plugins/diagnostic/index.ts
index 8f3cbe697..e4a447664 100644
--- a/src/@ionic-native/plugins/diagnostic/index.ts
+++ b/src/@ionic-native/plugins/diagnostic/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, Plugin, CordovaProperty, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Diagnostic
@@ -48,6 +43,7 @@ import {
 })
 @Injectable()
 export class Diagnostic extends IonicNativePlugin {
+
   permission = {
     READ_CALENDAR: 'READ_CALENDAR',
     WRITE_CALENDAR: 'WRITE_CALENDAR',
@@ -96,23 +92,9 @@ export class Diagnostic extends IonicNativePlugin {
     CONTACTS: ['READ_CONTACTS', 'WRITE_CONTACTS', 'GET_ACCOUNTS'],
     LOCATION: ['ACCESS_FINE_LOCATION', 'ACCESS_COARSE_LOCATION'],
     MICROPHONE: ['RECORD_AUDIO'],
-    PHONE: [
-      'READ_PHONE_STATE',
-      'CALL_PHONE',
-      'ADD_VOICEMAIL',
-      'USE_SIP',
-      'PROCESS_OUTGOING_CALLS',
-      'READ_CALL_LOG',
-      'WRITE_CALL_LOG'
-    ],
+    PHONE: ['READ_PHONE_STATE', 'CALL_PHONE', 'ADD_VOICEMAIL', 'USE_SIP', 'PROCESS_OUTGOING_CALLS', 'READ_CALL_LOG', 'WRITE_CALL_LOG'],
     SENSORS: ['BODY_SENSORS'],
-    SMS: [
-      'SEND_SMS',
-      'RECEIVE_SMS',
-      'READ_SMS',
-      'RECEIVE_WAP_PUSH',
-      'RECEIVE_MMS'
-    ],
+    SMS: ['SEND_SMS', 'RECEIVE_SMS', 'READ_SMS', 'RECEIVE_WAP_PUSH', 'RECEIVE_MMS'],
     STORAGE: ['READ_EXTERNAL_STORAGE', 'WRITE_EXTERNAL_STORAGE']
   };
 
@@ -159,9 +141,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isLocationAvailable(): Promise<any> {
-    return;
-  }
+  isLocationAvailable(): Promise<any> { return; }
 
   /**
    * Checks if Wifi is connected/enabled. On iOS this returns true if the device is connected to a network by WiFi. On Android and Windows 10 Mobile this returns true if the WiFi setting is set to enabled.
@@ -169,21 +149,17 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isWifiAvailable(): Promise<any> {
-    return;
-  }
+  isWifiAvailable(): Promise<any> { return; }
 
   /**
    * Checks if the device has a camera. On Android this returns true if the device has a camera. On iOS this returns true if both the device has a camera AND the application is authorized to use it. On Windows 10 Mobile this returns true if both the device has a rear-facing camera AND the
    * application is authorized to use it.
    * @param {boolean} [externalStorage] Android only: If true, checks permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
-   *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
+   *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.   
    * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse' })
-  isCameraAvailable(externalStorage?: boolean): Promise<any> {
-    return;
-  }
+  isCameraAvailable( externalStorage?: boolean ): Promise<any> { return; }
 
   /**
    * Checks if the device has Bluetooth capabilities and if so that Bluetooth is switched on (same on Android, iOS and Windows 10 Mobile)
@@ -191,42 +167,38 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isBluetoothAvailable(): Promise<any> {
-    return;
-  }
+  isBluetoothAvailable(): Promise<any> { return; }
 
   /**
    * Displays the device location settings to allow user to enable location services/change location mode.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10', 'iOS'] })
-  switchToLocationSettings(): void {}
+  switchToLocationSettings(): void { }
 
   /**
    * Displays mobile settings to allow user to enable mobile data.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  switchToMobileDataSettings(): void {}
+  switchToMobileDataSettings(): void { }
 
   /**
    * Displays Bluetooth settings to allow user to enable Bluetooth.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  switchToBluetoothSettings(): void {}
+  switchToBluetoothSettings(): void { }
 
   /**
    * Displays WiFi settings to allow user to enable WiFi.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  switchToWifiSettings(): void {}
+  switchToWifiSettings(): void { }
 
   /**
    * Returns true if the WiFi setting is set to enabled, and is the same as `isWifiAvailable()`
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'Windows 10'] })
-  isWifiEnabled(): Promise<boolean> {
-    return;
-  }
+  isWifiEnabled(): Promise<boolean> { return; }
 
   /**
    * Enables/disables WiFi on the device.
@@ -235,9 +207,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse', platforms: ['Android', 'Windows 10'] })
-  setWifiState(state: boolean): Promise<any> {
-    return;
-  }
+  setWifiState(state: boolean): Promise<any> { return; }
 
   /**
    * Enables/disables Bluetooth on the device.
@@ -246,9 +216,8 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse', platforms: ['Android', 'Windows 10'] })
-  setBluetoothState(state: boolean): Promise<any> {
-    return;
-  }
+  setBluetoothState(state: boolean): Promise<any> { return; }
+
 
   // ANDROID AND IOS ONLY
 
@@ -257,9 +226,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isLocationEnabled(): Promise<boolean> {
-    return;
-  }
+  isLocationEnabled(): Promise<boolean> { return; }
 
   /**
    * Checks if the application is authorized to use location.
@@ -267,18 +234,14 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isLocationAuthorized(): Promise<any> {
-    return;
-  }
+  isLocationAuthorized(): Promise<any> { return; }
 
   /**
    * Returns the location authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getLocationAuthorizationStatus(): Promise<any> {
-    return;
-  }
+  getLocationAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Returns the location authorization status for the application.
@@ -288,18 +251,14 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  requestLocationAuthorization(mode?: string): Promise<any> {
-    return;
-  }
+  requestLocationAuthorization(mode?: string): Promise<any> { return; }
 
   /**
    * Checks if camera hardware is present on device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isCameraPresent(): Promise<any> {
-    return;
-  }
+  isCameraPresent(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized to use the camera.
@@ -309,9 +268,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  isCameraAuthorized(externalStorage?: boolean): Promise<any> {
-    return;
-  }
+  isCameraAuthorized( externalStorage?: boolean ): Promise<any> { return; }
 
   /**
    * Returns the camera authorization status for the application.
@@ -320,9 +277,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  getCameraAuthorizationStatus(externalStorage?: boolean): Promise<any> {
-    return;
-  }
+  getCameraAuthorizationStatus( externalStorage?: boolean ): Promise<any> { return; }
 
   /**
    * Requests camera authorization for the application.
@@ -331,63 +286,49 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  requestCameraAuthorization(externalStorage?: boolean): Promise<any> {
-    return;
-  }
+  requestCameraAuthorization( externalStorage?: boolean ): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized to use the microphone.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isMicrophoneAuthorized(): Promise<boolean> {
-    return;
-  }
+  isMicrophoneAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the microphone authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getMicrophoneAuthorizationStatus(): Promise<any> {
-    return;
-  }
+  getMicrophoneAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Requests microphone authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  requestMicrophoneAuthorization(): Promise<any> {
-    return;
-  }
+  requestMicrophoneAuthorization(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized to use contacts (address book).
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isContactsAuthorized(): Promise<boolean> {
-    return;
-  }
+  isContactsAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the contacts authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getContactsAuthorizationStatus(): Promise<any> {
-    return;
-  }
+  getContactsAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Requests contacts authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  requestContactsAuthorization(): Promise<any> {
-    return;
-  }
+  requestContactsAuthorization(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized to use the calendar.
@@ -400,9 +341,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isCalendarAuthorized(): Promise<boolean> {
-    return;
-  }
+  isCalendarAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the calendar authorization status for the application.
@@ -416,9 +355,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getCalendarAuthorizationStatus(): Promise<any> {
-    return;
-  }
+  getCalendarAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Requests calendar authorization for the application.
@@ -435,9 +372,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  requestCalendarAuthorization(): Promise<any> {
-    return;
-  }
+  requestCalendarAuthorization(): Promise<any> { return; }
 
   /**
    * Opens settings page for this app.
@@ -446,32 +381,29 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  switchToSettings(): Promise<any> {
-    return;
-  }
+  switchToSettings(): Promise<any> { return; }
 
   /**
    * Returns the state of Bluetooth on the device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getBluetoothState(): Promise<any> {
-    return;
-  }
+  getBluetoothState(): Promise<any> { return; }
 
   /**
    * Registers a function to be called when a change in Bluetooth state occurs.
    * @param handler
    */
   @Cordova({ platforms: ['Android', 'iOS'], sync: true })
-  registerBluetoothStateChangeHandler(handler: Function): void {}
+  registerBluetoothStateChangeHandler(handler: Function): void { }
 
   /**
    * Registers a function to be called when a change in Location state occurs.
    * @param handler
    */
   @Cordova({ platforms: ['Android', 'iOS'], sync: true })
-  registerLocationStateChangeHandler(handler: Function): void {}
+  registerLocationStateChangeHandler(handler: Function): void { }
+
 
   // ANDROID ONLY
 
@@ -481,9 +413,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isGpsLocationAvailable(): Promise<boolean> {
-    return;
-  }
+  isGpsLocationAvailable(): Promise<boolean> { return; }
 
   /**
    * Checks if location mode is set to return high-accuracy locations from GPS hardware.
@@ -493,9 +423,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isGpsLocationEnabled(): Promise<any> {
-    return;
-  }
+  isGpsLocationEnabled(): Promise<any> { return; }
 
   /**
    * Checks if low-accuracy locations are available to the app from network triangulation/WiFi access points.
@@ -503,9 +431,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNetworkLocationAvailable(): Promise<any> {
-    return;
-  }
+  isNetworkLocationAvailable(): Promise<any> { return; }
 
   /**
    * Checks if location mode is set to return low-accuracy locations from network triangulation/WiFi access points.
@@ -515,18 +441,14 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNetworkLocationEnabled(): Promise<any> {
-    return;
-  }
+  isNetworkLocationEnabled(): Promise<any> { return; }
 
   /**
    * Returns the current location mode setting for the device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  getLocationMode(): Promise<any> {
-    return;
-  }
+  getLocationMode(): Promise<any> { return; }
 
   /**
    * Returns the current authorisation status for a given permission.
@@ -535,9 +457,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  getPermissionAuthorizationStatus(permission: any): Promise<any> {
-    return;
-  }
+  getPermissionAuthorizationStatus(permission: any): Promise<any> { return; }
 
   /**
    * Returns the current authorisation status for multiple permissions.
@@ -546,9 +466,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  getPermissionsAuthorizationStatus(permissions: any[]): Promise<any> {
-    return;
-  }
+  getPermissionsAuthorizationStatus(permissions: any[]): Promise<any> { return; }
 
   /**
    * Requests app to be granted authorisation for a runtime permission.
@@ -557,9 +475,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  requestRuntimePermission(permission: any): Promise<any> {
-    return;
-  }
+  requestRuntimePermission(permission: any): Promise<any> { return; }
 
   /**
    * Requests app to be granted authorisation for multiple runtime permissions.
@@ -568,9 +484,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  requestRuntimePermissions(permissions: any[]): Promise<any> {
-    return;
-  }
+  requestRuntimePermissions(permissions: any[]): Promise<any> { return; }
 
   /**
    * Indicates if the plugin is currently requesting a runtime permission via the native API.
@@ -580,9 +494,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  isRequestingPermission(): boolean {
-    return;
-  }
+  isRequestingPermission(): boolean { return; }
 
   /**
    * Registers a function to be called when a runtime permission request has completed.
@@ -590,9 +502,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @param handler {Function}
    */
   @Cordova({ sync: true })
-  registerPermissionRequestCompleteHandler(handler: Function): void {
-    return;
-  }
+  registerPermissionRequestCompleteHandler(handler: Function): void { return; }
 
   /**
    * Checks if the device setting for Bluetooth is switched on.
@@ -600,63 +510,49 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isBluetoothEnabled(): Promise<boolean> {
-    return;
-  }
+  isBluetoothEnabled(): Promise<boolean> { return; }
 
   /**
    * Checks if the device has Bluetooth capabilities.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  hasBluetoothSupport(): Promise<boolean> {
-    return;
-  }
+  hasBluetoothSupport(): Promise<boolean> { return; }
 
   /**
    * Checks if the device has Bluetooth Low Energy (LE) capabilities.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  hasBluetoothLESupport(): Promise<boolean> {
-    return;
-  }
+  hasBluetoothLESupport(): Promise<boolean> { return; }
 
   /**
    * Checks if the device supports Bluetooth Low Energy (LE) Peripheral mode.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  hasBluetoothLEPeripheralSupport(): Promise<boolean> {
-    return;
-  }
+  hasBluetoothLEPeripheralSupport(): Promise<boolean> { return; }
 
   /**
    * Checks if the application is authorized to use external storage.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isExternalStorageAuthorized(): Promise<boolean> {
-    return;
-  }
+  isExternalStorageAuthorized(): Promise<boolean> { return; }
 
   /**
    * CReturns the external storage authorization status for the application.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  getExternalStorageAuthorizationStatus(): Promise<any> {
-    return;
-  }
+  getExternalStorageAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Requests external storage authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  requestExternalStorageAuthorization(): Promise<any> {
-    return;
-  }
+  requestExternalStorageAuthorization(): Promise<any> { return; }
 
   /**
    * Returns details of external SD card(s): absolute path, is writable, free space.
@@ -669,9 +565,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  getExternalSdCardDetails(): Promise<any> {
-    return;
-  }
+  getExternalSdCardDetails(): Promise<any> { return; }
 
   /**
    * Switches to the wireless settings page in the Settings app. Allows configuration of wireless controls such as Wi-Fi, Bluetooth and Mobile networks.
@@ -680,7 +574,7 @@ export class Diagnostic extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  switchToWirelessSettings(): void {}
+  switchToWirelessSettings(): void { }
 
   /**
    * Displays NFC settings to allow user to enable NFC.
@@ -689,16 +583,14 @@ export class Diagnostic extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  switchToNFCSettings(): void {}
+  switchToNFCSettings(): void { }
 
   /**
    * Checks if NFC hardware is present on device.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNFCPresent(): Promise<boolean> {
-    return;
-  }
+  isNFCPresent(): Promise<boolean> { return; }
 
   /**
    * Checks if the device setting for NFC is switched on.
@@ -706,9 +598,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNFCEnabled(): Promise<boolean> {
-    return;
-  }
+  isNFCEnabled(): Promise<boolean> { return; }
 
   /**
    * Checks if NFC is available to the app. Returns true if the device has NFC capabilities AND if NFC setting is switched on.
@@ -716,9 +606,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNFCAvailable(): Promise<boolean> {
-    return;
-  }
+  isNFCAvailable(): Promise<boolean> { return; }
 
   /**
    * Registers a function to be called when a change in NFC state occurs. Pass in a falsey value to de-register the currently registered function.
@@ -729,34 +617,28 @@ export class Diagnostic extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  registerNFCStateChangeHandler(handler: Function): void {}
+  registerNFCStateChangeHandler(handler: Function): void { }
 
   /**
    * Checks if the device data roaming setting is enabled.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isDataRoamingEnabled(): Promise<boolean> {
-    return;
-  }
+  isDataRoamingEnabled(): Promise<boolean> { return; }
 
   /**
    * Checks if the device setting for ADB(debug) is switched on.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isADBModeEnabled(): Promise<boolean> {
-    return;
-  }
+  isADBModeEnabled(): Promise<boolean> { return; }
 
   /**
    * Checks if the device is rooted.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isDeviceRooted(): Promise<boolean> {
-    return;
-  }
+  isDeviceRooted(): Promise<boolean> { return; }
 
   // IOS ONLY
 
@@ -765,18 +647,14 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isCameraRollAuthorized(): Promise<boolean> {
-    return;
-  }
+  isCameraRollAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the authorization status for the application to use the Camera Roll in Photos app.
    * @returns {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getCameraRollAuthorizationStatus(): Promise<string> {
-    return;
-  }
+  getCameraRollAuthorizationStatus(): Promise<string> { return; }
 
   /**
    * Requests camera roll authorization for the application.
@@ -785,27 +663,21 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestCameraRollAuthorization(): Promise<any> {
-    return;
-  }
+  requestCameraRollAuthorization(): Promise<any> { return; }
 
   /**
    * Checks if remote (push) notifications are enabled.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS', 'Android'] })
-  isRemoteNotificationsEnabled(): Promise<boolean> {
-    return;
-  }
+  isRemoteNotificationsEnabled(): Promise<boolean> { return; }
 
   /**
    * Indicates if the app is registered for remote (push) notifications on the device.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isRegisteredForRemoteNotifications(): Promise<boolean> {
-    return;
-  }
+  isRegisteredForRemoteNotifications(): Promise<boolean> { return; }
 
   /**
    * Returns the authorization status for the application to use Remote Notifications.
@@ -813,9 +685,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getRemoteNotificationsAuthorizationStatus(): Promise<string> {
-    return;
-  }
+  getRemoteNotificationsAuthorizationStatus(): Promise<string> { return; }
 
   /**
    * Indicates the current setting of notification types for the app in the Settings app.
@@ -823,54 +693,42 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getRemoteNotificationTypes(): Promise<any> {
-    return;
-  }
+  getRemoteNotificationTypes(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized to use reminders.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isRemindersAuthorized(): Promise<boolean> {
-    return;
-  }
+  isRemindersAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the reminders authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getRemindersAuthorizationStatus(): Promise<any> {
-    return;
-  }
+  getRemindersAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Requests reminders authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestRemindersAuthorization(): Promise<any> {
-    return;
-  }
+  requestRemindersAuthorization(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized for background refresh.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isBackgroundRefreshAuthorized(): Promise<boolean> {
-    return;
-  }
+  isBackgroundRefreshAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the background refresh authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getBackgroundRefreshStatus(): Promise<any> {
-    return;
-  }
+  getBackgroundRefreshStatus(): Promise<any> { return; }
 
   /**
    * Requests Bluetooth authorization for the application.
@@ -879,18 +737,14 @@ export class Diagnostic extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestBluetoothAuthorization(): Promise<any> {
-    return;
-  }
+  requestBluetoothAuthorization(): Promise<any> { return; }
 
   /**
    * Checks if motion tracking is available on the current device.
    * @return {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isMotionAvailable(): Promise<boolean> {
-    return;
-  }
+  isMotionAvailable(): Promise<boolean> { return; }
 
   /**
    * Checks if it's possible to determine the outcome of a motion authorization request on the current device.
@@ -900,9 +754,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @return {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isMotionRequestOutcomeAvailable(): Promise<boolean> {
-    return;
-  }
+  isMotionRequestOutcomeAvailable(): Promise<boolean> { return; }
 
   /**
    * Requests motion tracking authorization for the application.
@@ -912,9 +764,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @return {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestMotionAuthorization(): Promise<string> {
-    return;
-  }
+  requestMotionAuthorization(): Promise<string> { return; }
 
   /**
    * Checks motion authorization status for the application.
@@ -924,7 +774,6 @@ export class Diagnostic extends IonicNativePlugin {
    * @return {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getMotionAuthorizationStatus(): Promise<string> {
-    return;
-  }
+  getMotionAuthorizationStatus(): Promise<string> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/dialogs/index.ts b/src/@ionic-native/plugins/dialogs/index.ts
index 9097e2630..65710e890 100644
--- a/src/@ionic-native/plugins/dialogs/index.ts
+++ b/src/@ionic-native/plugins/dialogs/index.ts
@@ -1,7 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 export interface DialogsPromptCallback {
+
   /**
    * The index of the pressed button. (Number) Note that the index uses one-based indexing, so the value is 1, 2, 3, etc.
    */
@@ -11,8 +13,10 @@ export interface DialogsPromptCallback {
    * The text entered in the prompt dialog box. (String)
    */
   input1: string;
+
 }
 
+
 /**
  * @name Dialogs
  * @description
@@ -46,6 +50,7 @@ export interface DialogsPromptCallback {
 })
 @Injectable()
 export class Dialogs extends IonicNativePlugin {
+
   /**
    * Shows a custom alert or dialog box.
    * @param {string} message Dialog message.
@@ -57,9 +62,7 @@ export class Dialogs extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 4
   })
-  alert(message: string, title?: string, buttonName?: string): Promise<any> {
-    return;
-  }
+  alert(message: string, title?: string, buttonName?: string): Promise<any> { return; }
 
   /**
    * Displays a customizable confirmation dialog box.
@@ -72,13 +75,7 @@ export class Dialogs extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 4
   })
-  confirm(
-    message: string,
-    title?: string,
-    buttonLabels?: string[]
-  ): Promise<number> {
-    return;
-  }
+  confirm(message: string, title?: string, buttonLabels?: string[]): Promise<number> { return; }
 
   /**
    * Displays a native dialog box that is more customizable than the browser's prompt function.
@@ -92,14 +89,8 @@ export class Dialogs extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 5
   })
-  prompt(
-    message?: string,
-    title?: string,
-    buttonLabels?: string[],
-    defaultText?: string
-  ): Promise<DialogsPromptCallback> {
-    return;
-  }
+  prompt(message?: string, title?: string, buttonLabels?: string[], defaultText?: string): Promise<DialogsPromptCallback> { return; }
+
 
   /**
    * The device plays a beep sound.
@@ -108,5 +99,6 @@ export class Dialogs extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  beep(times: number): void {}
+  beep(times: number): void { }
+
 }
diff --git a/src/@ionic-native/plugins/dns/index.ts b/src/@ionic-native/plugins/dns/index.ts
index 35ee1522f..ece314ed8 100644
--- a/src/@ionic-native/plugins/dns/index.ts
+++ b/src/@ionic-native/plugins/dns/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name DNS
@@ -36,7 +36,5 @@ export class DNS extends IonicNativePlugin {
    * @returns {Promise<string>} Returns a promise that resolves with the resolution.
    */
   @Cordova()
-  resolve(hostname: string): Promise<string> {
-    return;
-  }
+  resolve(hostname: string): Promise<string> { return; }
 }
diff --git a/src/@ionic-native/plugins/document-viewer/index.ts b/src/@ionic-native/plugins/document-viewer/index.ts
index 02ce4609b..ef4335cf1 100644
--- a/src/@ionic-native/plugins/document-viewer/index.ts
+++ b/src/@ionic-native/plugins/document-viewer/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface DocumentViewerOptions {
   title?: string;
@@ -62,15 +62,14 @@ export interface DocumentViewerOptions {
 })
 @Injectable()
 export class DocumentViewer extends IonicNativePlugin {
+
   /**
    * Displays the email composer pre-filled with data.
    *
    * @returns {Promise<any>} Resolves promise when the EmailComposer has been opened
    */
   @Cordova()
-  getSupportInfo(): Promise<any> {
-    return;
-  }
+  getSupportInfo(): Promise<any> { return; }
 
   /**
    * Check if the document can be shown
@@ -84,15 +83,7 @@ export class DocumentViewer extends IonicNativePlugin {
    * @param [onError] {Function}
    */
   @Cordova({ sync: true })
-  canViewDocument(
-    url: string,
-    contentType: string,
-    options: DocumentViewerOptions,
-    onPossible?: Function,
-    onMissingApp?: Function,
-    onImpossible?: Function,
-    onError?: Function
-  ): void {}
+  canViewDocument(url: string, contentType: string, options: DocumentViewerOptions, onPossible?: Function, onMissingApp?: Function, onImpossible?: Function, onError?: Function): void { }
 
   /**
    * Opens the file
@@ -106,13 +97,6 @@ export class DocumentViewer extends IonicNativePlugin {
    * @param [onError] {Function}
    */
   @Cordova({ sync: true })
-  viewDocument(
-    url: string,
-    contentType: string,
-    options: DocumentViewerOptions,
-    onShow?: Function,
-    onClose?: Function,
-    onMissingApp?: Function,
-    onError?: Function
-  ): void {}
+  viewDocument(url: string, contentType: string, options: DocumentViewerOptions, onShow?: Function, onClose?: Function, onMissingApp?: Function, onError?: Function): void { }
+
 }
diff --git a/src/@ionic-native/plugins/email-composer/index.ts b/src/@ionic-native/plugins/email-composer/index.ts
index d8024c122..ad148fd14 100644
--- a/src/@ionic-native/plugins/email-composer/index.ts
+++ b/src/@ionic-native/plugins/email-composer/index.ts
@@ -1,12 +1,8 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 
 export interface EmailComposerOptions {
+
   /**
    * App to send the email with
    */
@@ -46,8 +42,10 @@ export interface EmailComposerOptions {
    * Indicates if the body is HTML or plain text
    */
   isHtml?: boolean;
+
 }
 
+
 /**
  * @name Email Composer
  * @description
@@ -112,6 +110,7 @@ export interface EmailComposerOptions {
 })
 @Injectable()
 export class EmailComposer extends IonicNativePlugin {
+
   /**
    * Verifies if sending emails is supported on the device.
    *
@@ -149,9 +148,7 @@ export class EmailComposer extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 2
   })
-  requestPermission(): Promise<boolean> {
-    return;
-  }
+  requestPermission(): Promise<boolean> { return; }
 
   /**
    * Checks if the app has a permission to access email accounts information
@@ -161,9 +158,7 @@ export class EmailComposer extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 2
   })
-  hasPermission(): Promise<boolean> {
-    return;
-  }
+  hasPermission(): Promise<boolean> { return; }
 
   /**
    * Adds a new mail app alias.
@@ -172,7 +167,7 @@ export class EmailComposer extends IonicNativePlugin {
    * @param packageName {string} The package name
    */
   @Cordova()
-  addAlias(alias: string, packageName: string): void {}
+  addAlias(alias: string, packageName: string): void { }
 
   /**
    * Displays the email composer pre-filled with data.
@@ -185,7 +180,6 @@ export class EmailComposer extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 3
   })
-  open(options: EmailComposerOptions, scope?: any): Promise<any> {
-    return;
-  }
+  open(options: EmailComposerOptions, scope?: any): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/estimote-beacons/index.ts b/src/@ionic-native/plugins/estimote-beacons/index.ts
index 3155bd73b..5a6fde940 100644
--- a/src/@ionic-native/plugins/estimote-beacons/index.ts
+++ b/src/@ionic-native/plugins/estimote-beacons/index.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface EstimoteBeaconRegion {
+
   state?: string;
 
   major: number;
@@ -12,6 +13,7 @@ export interface EstimoteBeaconRegion {
   identifier?: string;
 
   uuid: string;
+
 }
 
 /**
@@ -46,6 +48,7 @@ export interface EstimoteBeaconRegion {
 })
 @Injectable()
 export class EstimoteBeacons extends IonicNativePlugin {
+
   /** Proximity value */
   ProximityUnknown = 0;
 
@@ -121,9 +124,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  requestWhenInUseAuthorization(): Promise<any> {
-    return;
-  }
+  requestWhenInUseAuthorization(): Promise<any> { return; }
 
   /**
    * Ask the user for permission to use location services
@@ -144,9 +145,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  requestAlwaysAuthorization(): Promise<any> {
-    return;
-  }
+  requestAlwaysAuthorization(): Promise<any> { return; }
 
   /**
    * Get the current location authorization status.
@@ -165,9 +164,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  authorizationStatus(): Promise<any> {
-    return;
-  }
+  authorizationStatus(): Promise<any> { return; }
 
   /**
    * Start advertising as a beacon.
@@ -189,14 +186,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
   @Cordova({
     clearFunction: 'stopAdvertisingAsBeacon'
   })
-  startAdvertisingAsBeacon(
-    uuid: string,
-    major: number,
-    minor: number,
-    regionId: string
-  ): Promise<any> {
-    return;
-  }
+  startAdvertisingAsBeacon(uuid: string, major: number, minor: number, regionId: string): Promise<any> { return; }
 
   /**
    * Stop advertising as a beacon.
@@ -212,9 +202,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopAdvertisingAsBeacon(): Promise<any> {
-    return;
-  }
+  stopAdvertisingAsBeacon(): Promise<any> { return; }
 
   /**
    * Enable analytics.
@@ -229,14 +217,12 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  enableAnalytics(enable: boolean): Promise<any> {
-    return;
-  }
+  enableAnalytics(enable: boolean): Promise<any> { return; }
 
   /**
-   * Test if analytics is enabled.
-   *
-   * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
+  * Test if analytics is enabled.
+  *
+  * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
    *
    * @usage
    * ```
@@ -245,14 +231,12 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isAnalyticsEnabled(): Promise<any> {
-    return;
-  }
+  isAnalyticsEnabled(): Promise<any> { return; }
 
   /**
-   * Test if App ID and App Token is set.
-   *
-   * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
+  * Test if App ID and App Token is set.
+  *
+  * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
    *
    * @usage
    * ```
@@ -261,14 +245,12 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isAuthorized(): Promise<any> {
-    return;
-  }
+  isAuthorized(): Promise<any> { return; }
 
   /**
-   * Set App ID and App Token.
-   *
-   * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
+  * Set App ID and App Token.
+  *
+  * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
    *
    * @usage
    * ```
@@ -279,9 +261,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  setupAppIDAndAppToken(appID: string, appToken: string): Promise<any> {
-    return;
-  }
+  setupAppIDAndAppToken(appID: string, appToken: string): Promise<any> { return; }
 
   /**
    * Start scanning for all nearby beacons using CoreBluetooth (no region object is used).
@@ -302,9 +282,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
     observable: true,
     clearFunction: 'stopEstimoteBeaconDiscovery'
   })
-  startEstimoteBeaconDiscovery(): Observable<any> {
-    return;
-  }
+  startEstimoteBeaconDiscovery(): Observable<any> { return; }
 
   /**
    * Stop CoreBluetooth scan. Available on iOS.
@@ -321,9 +299,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopEstimoteBeaconDiscovery(): Promise<any> {
-    return;
-  }
+  stopEstimoteBeaconDiscovery(): Promise<any> { return; }
 
   /**
    * Start ranging beacons. Available on iOS and Android.
@@ -346,9 +322,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
     clearFunction: 'stopRangingBeaconsInRegion',
     clearWithArgs: true
   })
-  startRangingBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> {
-    return;
-  }
+  startRangingBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
 
   /**
    * Stop ranging beacons. Available on iOS and Android.
@@ -367,9 +341,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopRangingBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> {
-    return;
-  }
+  stopRangingBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Start ranging secure beacons. Available on iOS.
@@ -384,11 +356,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
     clearFunction: 'stopRangingSecureBeaconsInRegion',
     clearWithArgs: true
   })
-  startRangingSecureBeaconsInRegion(
-    region: EstimoteBeaconRegion
-  ): Observable<any> {
-    return;
-  }
+  startRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
 
   /**
    * Stop ranging secure beacons. Available on iOS.
@@ -397,9 +365,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> {
-    return;
-  }
+  stopRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Start monitoring beacons. Available on iOS and Android.
@@ -425,12 +391,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  startMonitoringForRegion(
-    region: EstimoteBeaconRegion,
-    notifyEntryStateOnDisplay: boolean
-  ): Observable<any> {
-    return;
-  }
+  startMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
 
   /**
    * Stop monitoring beacons. Available on iOS and Android.
@@ -444,9 +405,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> {
-    return;
-  }
+  stopMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Start monitoring secure beacons. Available on iOS.
@@ -466,24 +425,17 @@ export class EstimoteBeacons extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  startSecureMonitoringForRegion(
-    region: EstimoteBeaconRegion,
-    notifyEntryStateOnDisplay: boolean
-  ): Observable<any> {
-    return;
-  }
+  startSecureMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
 
   /**
-   * Stop monitoring secure beacons. Available on iOS.
-   * This function has the same parameters/behaviour as
-   * {@link EstimoteBeacons.stopMonitoringForRegion}.
-   * @param region {EstimoteBeaconRegion} Region
-   * @returns {Promise<any>}
-   */
+  * Stop monitoring secure beacons. Available on iOS.
+  * This function has the same parameters/behaviour as
+  * {@link EstimoteBeacons.stopMonitoringForRegion}.
+  * @param region {EstimoteBeaconRegion} Region
+  * @returns {Promise<any>}
+  */
   @Cordova()
-  stopSecureMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> {
-    return;
-  }
+  stopSecureMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Connect to Estimote Beacon. Available on Android.
@@ -503,9 +455,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  connectToBeacon(beacon: any): Promise<any> {
-    return;
-  }
+  connectToBeacon(beacon: any): Promise<any> { return; }
 
   /**
    * Disconnect from connected Estimote Beacon. Available on Android.
@@ -517,9 +467,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  disconnectConnectedBeacon(): Promise<any> {
-    return;
-  }
+  disconnectConnectedBeacon(): Promise<any> { return; }
 
   /**
    * Write proximity UUID to connected Estimote Beacon. Available on Android.
@@ -533,9 +481,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  writeConnectedProximityUUID(uuid: any): Promise<any> {
-    return;
-  }
+  writeConnectedProximityUUID(uuid: any): Promise<any> { return; }
 
   /**
    * Write major to connected Estimote Beacon. Available on Android.
@@ -549,9 +495,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  writeConnectedMajor(major: number): Promise<any> {
-    return;
-  }
+  writeConnectedMajor(major: number): Promise<any> { return; }
 
   /**
    * Write minor to connected Estimote Beacon. Available on Android.
@@ -565,7 +509,6 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  writeConnectedMinor(minor: number): Promise<any> {
-    return;
-  }
+  writeConnectedMinor(minor: number): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/extended-device-information/index.ts b/src/@ionic-native/plugins/extended-device-information/index.ts
index 100b9b404..2a4b3110a 100644
--- a/src/@ionic-native/plugins/extended-device-information/index.ts
+++ b/src/@ionic-native/plugins/extended-device-information/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Extended Device Information
@@ -22,24 +22,28 @@ import { CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
   pluginName: 'ExtendedDeviceInformation',
   plugin: 'cordova-plugin-extended-device-information',
   pluginRef: 'extended-device-information',
-  repo:
-    'https://github.com/danielehrhardt/cordova-plugin-extended-device-information',
+  repo: 'https://github.com/danielehrhardt/cordova-plugin-extended-device-information',
   platforms: ['Android']
 })
 @Injectable()
 export class ExtendedDeviceInformation extends IonicNativePlugin {
+
   /**
    * Get the device's memory size
    */
-  @CordovaProperty memory: number;
+  @CordovaProperty
+  memory: number;
 
   /**
    * Get the device's CPU mhz
    */
-  @CordovaProperty cpumhz: string;
+  @CordovaProperty
+  cpumhz: string;
 
   /**
    * Get the total storage
    */
-  @CordovaProperty totalstorage: string;
+  @CordovaProperty
+  totalstorage: string;
+
 }
diff --git a/src/@ionic-native/plugins/facebook/index.ts b/src/@ionic-native/plugins/facebook/index.ts
index 5b408ce1c..21bd6f598 100644
--- a/src/@ionic-native/plugins/facebook/index.ts
+++ b/src/@ionic-native/plugins/facebook/index.ts
@@ -2,9 +2,11 @@ import { Injectable } from '@angular/core';
 import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface FacebookLoginResponse {
+
   status: string;
 
   authResponse: {
+
     session_key: boolean;
 
     accessToken: string;
@@ -16,7 +18,9 @@ export interface FacebookLoginResponse {
     secret: string;
 
     userID: string;
+
   };
+
 }
 
 /**
@@ -110,46 +114,46 @@ export interface FacebookLoginResponse {
   plugin: 'cordova-plugin-facebook4',
   pluginRef: 'facebookConnectPlugin',
   repo: 'https://github.com/jeduan/cordova-plugin-facebook4',
-  install:
-    'ionic cordova plugin add cordova-plugin-facebook4 --variable APP_ID="123456789" --variable APP_NAME="myApplication"',
+  install: 'ionic cordova plugin add cordova-plugin-facebook4 --variable APP_ID="123456789" --variable APP_NAME="myApplication"',
   installVariables: ['APP_ID', 'APP_NAME'],
   platforms: ['Android', 'iOS', 'Browser']
 })
 @Injectable()
 export class Facebook extends IonicNativePlugin {
+
   EVENTS: {
-    EVENT_NAME_ACTIVATED_APP: 'fb_mobile_activate_app';
-    EVENT_NAME_DEACTIVATED_APP: 'fb_mobile_deactivate_app';
-    EVENT_NAME_SESSION_INTERRUPTIONS: 'fb_mobile_app_interruptions';
-    EVENT_NAME_TIME_BETWEEN_SESSIONS: 'fb_mobile_time_between_sessions';
-    EVENT_NAME_COMPLETED_REGISTRATION: 'fb_mobile_complete_registration';
-    EVENT_NAME_VIEWED_CONTENT: 'fb_mobile_content_view';
-    EVENT_NAME_SEARCHED: 'fb_mobile_search';
-    EVENT_NAME_RATED: 'fb_mobile_rate';
-    EVENT_NAME_COMPLETED_TUTORIAL: 'fb_mobile_tutorial_completion';
-    EVENT_NAME_PUSH_TOKEN_OBTAINED: 'fb_mobile_obtain_push_token';
-    EVENT_NAME_ADDED_TO_CART: 'fb_mobile_add_to_cart';
-    EVENT_NAME_ADDED_TO_WISHLIST: 'fb_mobile_add_to_wishlist';
-    EVENT_NAME_INITIATED_CHECKOUT: 'fb_mobile_initiated_checkout';
-    EVENT_NAME_ADDED_PAYMENT_INFO: 'fb_mobile_add_payment_info';
-    EVENT_NAME_PURCHASED: 'fb_mobile_purchase';
-    EVENT_NAME_ACHIEVED_LEVEL: 'fb_mobile_level_achieved';
-    EVENT_NAME_UNLOCKED_ACHIEVEMENT: 'fb_mobile_achievement_unlocked';
-    EVENT_NAME_SPENT_CREDITS: 'fb_mobile_spent_credits';
-    EVENT_PARAM_CURRENCY: 'fb_currency';
-    EVENT_PARAM_REGISTRATION_METHOD: 'fb_registration_method';
-    EVENT_PARAM_CONTENT_TYPE: 'fb_content_type';
-    EVENT_PARAM_CONTENT_ID: 'fb_content_id';
-    EVENT_PARAM_SEARCH_STRING: 'fb_search_string';
-    EVENT_PARAM_SUCCESS: 'fb_success';
-    EVENT_PARAM_MAX_RATING_VALUE: 'fb_max_rating_value';
-    EVENT_PARAM_PAYMENT_INFO_AVAILABLE: 'fb_payment_info_available';
-    EVENT_PARAM_NUM_ITEMS: 'fb_num_items';
-    EVENT_PARAM_LEVEL: 'fb_level';
-    EVENT_PARAM_DESCRIPTION: 'fb_description';
-    EVENT_PARAM_SOURCE_APPLICATION: 'fb_mobile_launch_source';
-    EVENT_PARAM_VALUE_YES: '1';
-    EVENT_PARAM_VALUE_NO: '0';
+    EVENT_NAME_ACTIVATED_APP: 'fb_mobile_activate_app',
+    EVENT_NAME_DEACTIVATED_APP: 'fb_mobile_deactivate_app',
+    EVENT_NAME_SESSION_INTERRUPTIONS: 'fb_mobile_app_interruptions',
+    EVENT_NAME_TIME_BETWEEN_SESSIONS: 'fb_mobile_time_between_sessions',
+    EVENT_NAME_COMPLETED_REGISTRATION: 'fb_mobile_complete_registration',
+    EVENT_NAME_VIEWED_CONTENT: 'fb_mobile_content_view',
+    EVENT_NAME_SEARCHED: 'fb_mobile_search',
+    EVENT_NAME_RATED: 'fb_mobile_rate',
+    EVENT_NAME_COMPLETED_TUTORIAL: 'fb_mobile_tutorial_completion',
+    EVENT_NAME_PUSH_TOKEN_OBTAINED: 'fb_mobile_obtain_push_token',
+    EVENT_NAME_ADDED_TO_CART: 'fb_mobile_add_to_cart',
+    EVENT_NAME_ADDED_TO_WISHLIST: 'fb_mobile_add_to_wishlist',
+    EVENT_NAME_INITIATED_CHECKOUT: 'fb_mobile_initiated_checkout',
+    EVENT_NAME_ADDED_PAYMENT_INFO: 'fb_mobile_add_payment_info',
+    EVENT_NAME_PURCHASED: 'fb_mobile_purchase',
+    EVENT_NAME_ACHIEVED_LEVEL: 'fb_mobile_level_achieved',
+    EVENT_NAME_UNLOCKED_ACHIEVEMENT: 'fb_mobile_achievement_unlocked',
+    EVENT_NAME_SPENT_CREDITS: 'fb_mobile_spent_credits',
+    EVENT_PARAM_CURRENCY: 'fb_currency',
+    EVENT_PARAM_REGISTRATION_METHOD: 'fb_registration_method',
+    EVENT_PARAM_CONTENT_TYPE: 'fb_content_type',
+    EVENT_PARAM_CONTENT_ID: 'fb_content_id',
+    EVENT_PARAM_SEARCH_STRING: 'fb_search_string',
+    EVENT_PARAM_SUCCESS: 'fb_success',
+    EVENT_PARAM_MAX_RATING_VALUE: 'fb_max_rating_value',
+    EVENT_PARAM_PAYMENT_INFO_AVAILABLE: 'fb_payment_info_available',
+    EVENT_PARAM_NUM_ITEMS: 'fb_num_items',
+    EVENT_PARAM_LEVEL: 'fb_level',
+    EVENT_PARAM_DESCRIPTION: 'fb_description',
+    EVENT_PARAM_SOURCE_APPLICATION: 'fb_mobile_launch_source',
+    EVENT_PARAM_VALUE_YES: '1',
+    EVENT_PARAM_VALUE_NO: '0'
   };
 
   /**
@@ -185,9 +189,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<FacebookLoginResponse>} Returns a Promise that resolves with a status object if login succeeds, and rejects if login fails.
    */
   @Cordova()
-  login(permissions: string[]): Promise<FacebookLoginResponse> {
-    return;
-  }
+  login(permissions: string[]): Promise<FacebookLoginResponse> { return; }
 
   /**
    * Logout of Facebook.
@@ -196,9 +198,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves on a successful logout, and rejects if logout fails.
    */
   @Cordova()
-  logout(): Promise<any> {
-    return;
-  }
+  logout(): Promise<any> { return; }
 
   /**
    * Determine if a user is logged in to Facebook and has authenticated your app.  There are three possible states for a user:
@@ -227,9 +227,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with a status, or rejects with an error
    */
   @Cordova()
-  getLoginStatus(): Promise<any> {
-    return;
-  }
+  getLoginStatus(): Promise<any> { return; }
 
   /**
    * Get a Facebook access token for using Facebook services.
@@ -237,9 +235,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<string>} Returns a Promise that resolves with an access token, or rejects with an error
    */
   @Cordova()
-  getAccessToken(): Promise<string> {
-    return;
-  }
+  getAccessToken(): Promise<string> { return; }
 
   /**
    * Show one of various Facebook dialogs. Example of options for a Share dialog:
@@ -259,9 +255,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with success data, or rejects with an error
    */
   @Cordova()
-  showDialog(options: any): Promise<any> {
-    return;
-  }
+  showDialog(options: any): Promise<any> { return; }
 
   /**
    * Make a call to Facebook Graph API. Can take additional permissions beyond those granted on login.
@@ -277,9 +271,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the result of the request, or rejects with an error
    */
   @Cordova()
-  api(requestPath: string, permissions: string[]): Promise<any> {
-    return;
-  }
+  api(requestPath: string, permissions: string[]): Promise<any> { return; }
 
   /**
    * Log an event.  For more information see the Events section above.
@@ -293,9 +285,7 @@ export class Facebook extends IonicNativePlugin {
     successIndex: 3,
     errorIndex: 4
   })
-  logEvent(name: string, params?: Object, valueToSum?: number): Promise<any> {
-    return;
-  }
+  logEvent(name: string, params?: Object, valueToSum?: number): Promise<any> { return; }
 
   /**
    * Log a purchase. For more information see the Events section above.
@@ -305,9 +295,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  logPurchase(value: number, currency: string): Promise<any> {
-    return;
-  }
+  logPurchase(value: number, currency: string): Promise<any> { return; }
 
   /**
    * Open App Invite dialog. Does not require login.
@@ -324,7 +312,9 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the result data, or rejects with an error
    */
   @Cordova()
-  appInvite(options: { url: string; picture: string }): Promise<any> {
-    return;
-  }
+  appInvite(options: {
+    url: string,
+    picture: string
+  }): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/fcm/index.ts b/src/@ionic-native/plugins/fcm/index.ts
index f6a23d2b3..af5f0b5e3 100644
--- a/src/@ionic-native/plugins/fcm/index.ts
+++ b/src/@ionic-native/plugins/fcm/index.ts
@@ -1,8 +1,9 @@
+import { Plugin, IonicNativePlugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface NotificationData {
+
   /**
    * Determines whether the notification was pressed or not
    */
@@ -14,6 +15,7 @@ export interface NotificationData {
    */
 
   [name: string]: any;
+
 }
 
 /**
@@ -62,15 +64,14 @@ export interface NotificationData {
 })
 @Injectable()
 export class FCM extends IonicNativePlugin {
+
   /**
    * Get's device's current registration id
    *
    * @returns {Promise<string>} Returns a Promise that resolves with the registration id token
    */
   @Cordova()
-  getToken(): Promise<string> {
-    return;
-  }
+  getToken(): Promise<string> { return; }
 
   /**
    * Event firing on the token refresh
@@ -80,9 +81,7 @@ export class FCM extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  onTokenRefresh(): Observable<string> {
-    return;
-  }
+  onTokenRefresh(): Observable<string> { return; }
 
   /**
    * Subscribes you to a [topic](https://firebase.google.com/docs/notifications/android/console-topics)
@@ -92,9 +91,7 @@ export class FCM extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a promise resolving in result of subscribing to a topic
    */
   @Cordova()
-  subscribeToTopic(topic: string): Promise<any> {
-    return;
-  }
+  subscribeToTopic(topic: string): Promise<any> { return; }
 
   /**
    * Unubscribes you from a [topic](https://firebase.google.com/docs/notifications/android/console-topics)
@@ -104,9 +101,7 @@ export class FCM extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a promise resolving in result of unsubscribing from a topic
    */
   @Cordova()
-  unsubscribeFromTopic(topic: string): Promise<any> {
-    return;
-  }
+  unsubscribeFromTopic(topic: string): Promise<any> { return; }
 
   /**
    * Watch for incoming notifications
@@ -118,7 +113,6 @@ export class FCM extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 2
   })
-  onNotification(): Observable<NotificationData> {
-    return;
-  }
+  onNotification(): Observable<NotificationData> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/file-chooser/index.ts b/src/@ionic-native/plugins/file-chooser/index.ts
index 4ea4d6eba..310441886 100644
--- a/src/@ionic-native/plugins/file-chooser/index.ts
+++ b/src/@ionic-native/plugins/file-chooser/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name File Chooser
@@ -30,12 +30,12 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class FileChooser extends IonicNativePlugin {
+
   /**
    * Open a file
    * @returns {Promise<string>}
    */
   @Cordova()
-  open(): Promise<string> {
-    return;
-  }
+  open(): Promise<string> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/file-encryption/index.ts b/src/@ionic-native/plugins/file-encryption/index.ts
index 5ac429aed..345cdb2e3 100644
--- a/src/@ionic-native/plugins/file-encryption/index.ts
+++ b/src/@ionic-native/plugins/file-encryption/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name File Encryption
@@ -30,6 +30,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class FileEncryption extends IonicNativePlugin {
+
   /**
    * Enrcypt a file
    * @param file {string} A string representing a local URI
@@ -37,9 +38,7 @@ export class FileEncryption extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when something happens
    */
   @Cordova()
-  encrypt(file: string, key: string): Promise<any> {
-    return;
-  }
+  encrypt(file: string, key: string): Promise<any> { return; }
 
   /**
    * Decrypt a file
@@ -48,7 +47,6 @@ export class FileEncryption extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when something happens
    */
   @Cordova()
-  decrypt(file: string, key: string): Promise<any> {
-    return;
-  }
+  decrypt(file: string, key: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/file-opener/index.ts b/src/@ionic-native/plugins/file-opener/index.ts
index 7776a2d35..1250e1c7d 100644
--- a/src/@ionic-native/plugins/file-opener/index.ts
+++ b/src/@ionic-native/plugins/file-opener/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name File Opener
@@ -29,6 +29,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class FileOpener extends IonicNativePlugin {
+
   /**
    * Open an file
    * @param filePath {string} File Path
@@ -40,9 +41,7 @@ export class FileOpener extends IonicNativePlugin {
     successName: 'success',
     errorName: 'error'
   })
-  open(filePath: string, fileMIMEType: string): Promise<any> {
-    return;
-  }
+  open(filePath: string, fileMIMEType: string): Promise<any> { return; }
 
   /**
    * Uninstalls a package
@@ -54,9 +53,7 @@ export class FileOpener extends IonicNativePlugin {
     successName: 'success',
     errorName: 'error'
   })
-  uninstall(packageId: string): Promise<any> {
-    return;
-  }
+  uninstall(packageId: string): Promise<any> { return; }
 
   /**
    * Check if an app is already installed
@@ -68,7 +65,6 @@ export class FileOpener extends IonicNativePlugin {
     successName: 'success',
     errorName: 'error'
   })
-  appIsInstalled(packageId: string): Promise<any> {
-    return;
-  }
+  appIsInstalled(packageId: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/file-path/index.ts b/src/@ionic-native/plugins/file-path/index.ts
index c35450e6e..29dc9b719 100644
--- a/src/@ionic-native/plugins/file-path/index.ts
+++ b/src/@ionic-native/plugins/file-path/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 declare const window: any;
 
@@ -32,13 +32,13 @@ declare const window: any;
 })
 @Injectable()
 export class FilePath extends IonicNativePlugin {
+
   /**
    * Resolve native path for given content URL/path.
    * @param {String} path  Content URL/path.
    * @returns {Promise<string>}
    */
   @Cordova()
-  resolveNativePath(path: string): Promise<string> {
-    return;
-  }
+  resolveNativePath(path: string): Promise<string> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/file-transfer/index.ts b/src/@ionic-native/plugins/file-transfer/index.ts
index cf4e38af6..0530d56d5 100644
--- a/src/@ionic-native/plugins/file-transfer/index.ts
+++ b/src/@ionic-native/plugins/file-transfer/index.ts
@@ -1,13 +1,8 @@
 import { Injectable } from '@angular/core';
-import {
-  checkAvailability,
-  CordovaInstance,
-  InstanceCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { CordovaInstance, Plugin, InstanceCheck, checkAvailability, IonicNativePlugin } from '@ionic-native/core';
 
 export interface FileUploadOptions {
+
   /**
    * The name of the form element.
    * Defaults to 'file'.
@@ -35,7 +30,7 @@ export interface FileUploadOptions {
   /**
    * A set of optional key/value pairs to pass in the HTTP request.
    */
-  params?: { [s: string]: any };
+  params?: { [s: string]: any; };
 
   /**
    * Whether to upload the data in chunked streaming mode.
@@ -48,10 +43,12 @@ export interface FileUploadOptions {
    * than one value. On iOS, FireOS, and Android, if a header named
    * Content-Type is present, multipart form data will NOT be used.
    */
-  headers?: { [s: string]: any };
+  headers?: { [s: string]: any; };
+
 }
 
 export interface FileUploadResult {
+
   /**
    * The number of bytes sent to the server as part of the upload.
    */
@@ -70,10 +67,12 @@ export interface FileUploadResult {
   /**
    * The HTTP response headers by the server.
    */
-  headers: { [s: string]: any };
+  headers: { [s: string]: any; };
+
 }
 
 export interface FileTransferError {
+
   /**
    * One of the predefined error codes listed below.
    */
@@ -104,6 +103,7 @@ export interface FileTransferError {
    * Either e.getMessage or e.toString.
    */
   exception: string;
+
 }
 
 /**
@@ -179,18 +179,11 @@ export interface FileTransferError {
   plugin: 'cordova-plugin-file-transfer',
   pluginRef: 'FileTransfer',
   repo: 'https://github.com/apache/cordova-plugin-file-transfer',
-  platforms: [
-    'Amazon Fire OS',
-    'Android',
-    'Browser',
-    'iOS',
-    'Ubuntu',
-    'Windows',
-    'Windows Phone'
-  ]
+  platforms: ['Amazon Fire OS', 'Android', 'Browser', 'iOS', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
 export class FileTransfer extends IonicNativePlugin {
+
   /**
    * Error code rejected from upload with FileTransferError
    * Defined in FileTransferError.
@@ -216,6 +209,7 @@ export class FileTransfer extends IonicNativePlugin {
   create(): FileTransferObject {
     return new FileTransferObject();
   }
+
 }
 
 /**
@@ -229,13 +223,7 @@ export class FileTransferObject {
   private _objectInstance: any;
 
   constructor() {
-    if (
-      checkAvailability(
-        FileTransfer.getPluginRef(),
-        null,
-        FileTransfer.getPluginName()
-      ) === true
-    ) {
+    if (checkAvailability(FileTransfer.getPluginRef(), null, FileTransfer.getPluginName()) === true) {
       this._objectInstance = new (FileTransfer.getPlugin())();
     }
   }
@@ -253,14 +241,7 @@ export class FileTransferObject {
     successIndex: 2,
     errorIndex: 3
   })
-  upload(
-    fileUrl: string,
-    url: string,
-    options?: FileUploadOptions,
-    trustAllHosts?: boolean
-  ): Promise<FileUploadResult> {
-    return;
-  }
+  upload(fileUrl: string, url: string, options?: FileUploadOptions, trustAllHosts?: boolean): Promise<FileUploadResult> { return; }
 
   /**
    * Downloads a file from server.
@@ -275,14 +256,7 @@ export class FileTransferObject {
     successIndex: 2,
     errorIndex: 3
   })
-  download(
-    source: string,
-    target: string,
-    trustAllHosts?: boolean,
-    options?: { [s: string]: any }
-  ): Promise<any> {
-    return;
-  }
+  download(source: string, target: string, trustAllHosts?: boolean, options?: { [s: string]: any; }): Promise<any> { return; }
 
   /**
    * Registers a listener that gets called whenever a new chunk of data is transferred.
diff --git a/src/@ionic-native/plugins/file/index.ts b/src/@ionic-native/plugins/file/index.ts
index c05ae829c..f6c7f06dc 100644
--- a/src/@ionic-native/plugins/file/index.ts
+++ b/src/@ionic-native/plugins/file/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  CordovaCheck,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { CordovaProperty, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 
 export interface IFile extends Blob {
   /**
@@ -41,6 +36,7 @@ export interface IFile extends Blob {
 }
 
 export interface LocalFileSystem {
+
   /**
    * Used for storage with no guarantee of persistence.
    */
@@ -58,12 +54,7 @@ export interface LocalFileSystem {
    * @param successCallback The callback that is called when the user agent provides a filesystem.
    * @param errorCallback A callback that is called when errors happen, or when the request to obtain the filesystem is denied.
    */
-  requestFileSystem(
-    type: number,
-    size: number,
-    successCallback: FileSystemCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  requestFileSystem(type: number, size: number, successCallback: FileSystemCallback, errorCallback?: ErrorCallback): void;
 
   /**
    * Allows the user to look up the Entry for a file or directory referred to by a local URL.
@@ -71,21 +62,12 @@ export interface LocalFileSystem {
    * @param successCallback A callback that is called to report the Entry to which the supplied URL refers.
    * @param errorCallback A callback that is called when errors happen, or when the request to obtain the Entry is denied.
    */
-  resolveLocalFileSystemURL(
-    url: string,
-    successCallback: EntryCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  resolveLocalFileSystemURL(url: string, successCallback: EntryCallback, errorCallback?: ErrorCallback): void;
 
   /**
    * see requestFileSystem.
    */
-  webkitRequestFileSystem(
-    type: number,
-    size: number,
-    successCallback: FileSystemCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  webkitRequestFileSystem(type: number, size: number, successCallback: FileSystemCallback, errorCallback?: ErrorCallback): void;
 }
 
 export interface Metadata {
@@ -133,9 +115,11 @@ export interface FileSystem {
   toJSON(): string;
 
   encodeURIPath(path: string): string;
+
 }
 
 export interface Entry {
+
   /**
    * Entry is a file.
    */
@@ -151,10 +135,7 @@ export interface Entry {
    * @param successCallback A callback that is called with the time of the last modification.
    * @param errorCallback ErrorCallback A callback that is called when errors happen.
    */
-  getMetadata(
-    successCallback: MetadataCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  getMetadata(successCallback: MetadataCallback, errorCallback?: ErrorCallback): void;
 
   /**
    * Set the metadata of the entry.
@@ -162,11 +143,7 @@ export interface Entry {
    * @param errorCallback {Function} is called with a FileError
    * @param metadataObject {Metadata} keys and values to set
    */
-  setMetadata(
-    successCallback: MetadataCallback,
-    errorCallback: ErrorCallback,
-    metadataObject: Metadata
-  ): void;
+  setMetadata(successCallback: MetadataCallback, errorCallback: ErrorCallback, metadataObject: Metadata): void;
 
   /**
    * The name of the entry, excluding the path leading to it.
@@ -202,12 +179,7 @@ export interface Entry {
    * A move of a file on top of an existing file must attempt to delete and replace that file.
    * A move of a directory on top of an existing empty directory must attempt to delete and replace that directory.
    */
-  moveTo(
-    parent: DirectoryEntry,
-    newName?: string,
-    successCallback?: EntryCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  moveTo(parent: DirectoryEntry, newName?: string, successCallback?: EntryCallback, errorCallback?: ErrorCallback): void;
 
   /**
    * Copy an entry to a different location on the file system. It is an error to try to:
@@ -224,12 +196,7 @@ export interface Entry {
    *
    * Directory copies are always recursive--that is, they copy all contents of the directory.
    */
-  copyTo(
-    parent: DirectoryEntry,
-    newName?: string,
-    successCallback?: EntryCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  copyTo(parent: DirectoryEntry, newName?: string, successCallback?: EntryCallback, errorCallback?: ErrorCallback): void;
 
   /**
    * Returns a URL that can be used to identify this entry. Unlike the URN defined in [FILE-API-ED], it has no specific expiration; as it describes a location on disk, it should be valid at least as long as that location exists.
@@ -254,10 +221,7 @@ export interface Entry {
    * @param successCallback A callback that is called to return the parent Entry.
    * @param errorCallback A callback that is called when errors happen.
    */
-  getParent(
-    successCallback: DirectoryEntryCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  getParent(successCallback: DirectoryEntryCallback, errorCallback?: ErrorCallback): void;
 }
 
 /**
@@ -283,12 +247,7 @@ export interface DirectoryEntry extends Entry {
    * @param successCallback A callback that is called to return the File selected or created.
    * @param errorCallback A callback that is called when errors happen.
    */
-  getFile(
-    path: string,
-    options?: Flags,
-    successCallback?: FileEntryCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  getFile(path: string, options?: Flags, successCallback?: FileEntryCallback, errorCallback?: ErrorCallback): void;
 
   /**
    * Creates or looks up a directory.
@@ -305,22 +264,14 @@ export interface DirectoryEntry extends Entry {
    * @param errorCallback A callback that is called when errors happen.
    *
    */
-  getDirectory(
-    path: string,
-    options?: Flags,
-    successCallback?: DirectoryEntryCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  getDirectory(path: string, options?: Flags, successCallback?: DirectoryEntryCallback, errorCallback?: ErrorCallback): void;
 
   /**
    * Deletes a directory and all of its contents, if any. In the event of an error [e.g. trying to delete a directory that contains a file that cannot be removed], some of the contents of the directory may be deleted. It is an error to attempt to delete the root directory of a filesystem.
    * @param successCallback A callback that is called on success.
    * @param errorCallback A callback that is called when errors happen.
    */
-  removeRecursively(
-    successCallback: VoidCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  removeRecursively(successCallback: VoidCallback, errorCallback?: ErrorCallback): void;
 }
 
 /**
@@ -340,10 +291,7 @@ export interface DirectoryReader {
    * @param successCallback Called once per successful call to readEntries to deliver the next previously-unreported set of Entries in the associated Directory. If all Entries have already been returned from previous invocations of readEntries, successCallback must be called with a zero-length array as an argument.
    * @param errorCallback A callback indicating that there was an error reading from the Directory.
    */
-  readEntries(
-    successCallback: EntriesCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  readEntries(successCallback: EntriesCallback, errorCallback?: ErrorCallback): void;
 }
 
 /**
@@ -355,10 +303,7 @@ export interface FileEntry extends Entry {
    * @param successCallback A callback that is called with the new FileWriter.
    * @param errorCallback A callback that is called when errors happen.
    */
-  createWriter(
-    successCallback: FileWriterCallback,
-    errorCallback?: ErrorCallback
-  ): void;
+  createWriter(successCallback: FileWriterCallback, errorCallback?: ErrorCallback): void;
 
   /**
    * Returns a File that represents the current state of the file that this FileEntry represents.
@@ -633,6 +578,7 @@ export declare class FileReader {
    * @hidden
    */
   [key: string]: any;
+
 }
 
 interface Window extends LocalFileSystem {}
@@ -678,66 +624,79 @@ declare const window: Window;
 })
 @Injectable()
 export class File extends IonicNativePlugin {
-  /**
-   *  Read-only directory where the application is installed.
-   */
-  @CordovaProperty applicationDirectory: string;
 
   /**
    *  Read-only directory where the application is installed.
    */
-  @CordovaProperty applicationStorageDirectory: string;
+  @CordovaProperty
+  applicationDirectory: string;
+
+  /**
+   *  Read-only directory where the application is installed.
+   */
+  @CordovaProperty
+  applicationStorageDirectory: string;
 
   /**
    * Where to put app-specific data files.
    */
-  @CordovaProperty dataDirectory: string;
+  @CordovaProperty
+  dataDirectory: string;
 
   /**
    * Cached files that should survive app restarts.
    * Apps should not rely on the OS to delete files in here.
    */
-  @CordovaProperty cacheDirectory: string;
+  @CordovaProperty
+  cacheDirectory: string;
 
   /**
    * Android: the application space on external storage.
    */
-  @CordovaProperty externalApplicationStorageDirectory: string;
+  @CordovaProperty
+  externalApplicationStorageDirectory: string;
 
   /**
    *  Android: Where to put app-specific data files on external storage.
    */
-  @CordovaProperty externalDataDirectory: string;
+  @CordovaProperty
+  externalDataDirectory: string;
 
   /**
    * Android: the application cache on external storage.
    */
-  @CordovaProperty externalCacheDirectory: string;
+  @CordovaProperty
+  externalCacheDirectory: string;
 
   /**
    * Android: the external storage (SD card) root.
    */
-  @CordovaProperty externalRootDirectory: string;
+  @CordovaProperty
+  externalRootDirectory: string;
 
   /**
    * iOS: Temp directory that the OS can clear at will.
    */
-  @CordovaProperty tempDirectory: string;
+  @CordovaProperty
+  tempDirectory: string;
 
   /**
    * iOS: Holds app-specific files that should be synced (e.g. to iCloud).
    */
-  @CordovaProperty syncedDataDirectory: string;
+  @CordovaProperty
+  syncedDataDirectory: string;
 
   /**
    * iOS: Files private to the app, but that are meaningful to other applications (e.g. Office files)
    */
-  @CordovaProperty documentsDirectory: string;
+  @CordovaProperty
+  documentsDirectory: string;
 
   /**
    * BlackBerry10: Files globally available to all apps
    */
-  @CordovaProperty sharedDirectory: string;
+  @CordovaProperty
+  sharedDirectory: string;
 
   cordovaFileError: any = {
     1: 'NOT_FOUND_ERR',
@@ -753,7 +712,7 @@ export class File extends IonicNativePlugin {
     11: 'TYPE_MISMATCH_ERR',
     12: 'PATH_EXISTS_ERR',
     13: 'WRONG_ENTRY_TYPE',
-    14: 'DIR_READ_ERR'
+    14: 'DIR_READ_ERR',
   };
 
   /**
@@ -776,16 +735,17 @@ export class File extends IonicNativePlugin {
    */
   @CordovaCheck()
   checkDir(path: string, dir: string): Promise<boolean> {
-    if (/^\//.test(dir)) {
+    if ((/^\//.test(dir))) {
       let err = new FileError(5);
-      err.message = 'directory cannot start with /';
+      err.message = 'directory cannot start with \/';
       return Promise.reject<any>(err);
     }
 
     let fullpath = path + dir;
-    return this.resolveDirectoryUrl(fullpath).then(() => {
-      return true;
-    });
+    return this.resolveDirectoryUrl(fullpath)
+      .then(() => {
+        return true;
+      });
   }
 
   /**
@@ -799,14 +759,10 @@ export class File extends IonicNativePlugin {
    * @returns {Promise<DirectoryEntry>} Returns a Promise that resolves with a DirectoryEntry or rejects with an error.
    */
   @CordovaCheck()
-  createDir(
-    path: string,
-    dirName: string,
-    replace: boolean
-  ): Promise<DirectoryEntry> {
-    if (/^\//.test(dirName)) {
+  createDir(path: string, dirName: string, replace: boolean): Promise<DirectoryEntry> {
+    if ((/^\//.test(dirName))) {
       let err = new FileError(5);
-      err.message = 'directory cannot start with /';
+      err.message = 'directory cannot start with \/';
       return Promise.reject<any>(err);
     }
 
@@ -818,9 +774,10 @@ export class File extends IonicNativePlugin {
       options.exclusive = true;
     }
 
-    return this.resolveDirectoryUrl(path).then(fse => {
-      return this.getDirectory(fse, dirName, options);
-    });
+    return this.resolveDirectoryUrl(path)
+      .then((fse) => {
+        return this.getDirectory(fse, dirName, options);
+      });
   }
 
   /**
@@ -832,17 +789,17 @@ export class File extends IonicNativePlugin {
    */
   @CordovaCheck()
   removeDir(path: string, dirName: string): Promise<RemoveResult> {
-    if (/^\//.test(dirName)) {
+    if ((/^\//.test(dirName))) {
       let err = new FileError(5);
-      err.message = 'directory cannot start with /';
+      err.message = 'directory cannot start with \/';
       return Promise.reject<any>(err);
     }
 
     return this.resolveDirectoryUrl(path)
-      .then(fse => {
+      .then((fse) => {
         return this.getDirectory(fse, dirName, { create: false });
       })
-      .then(de => {
+      .then((de) => {
         return this.remove(de);
       });
   }
@@ -857,28 +814,24 @@ export class File extends IonicNativePlugin {
    * @returns {Promise<DirectoryEntry|Entry>} Returns a Promise that resolves to the new DirectoryEntry object or rejects with an error.
    */
   @CordovaCheck()
-  moveDir(
-    path: string,
-    dirName: string,
-    newPath: string,
-    newDirName: string
-  ): Promise<DirectoryEntry | Entry> {
+  moveDir(path: string, dirName: string, newPath: string, newDirName: string): Promise<DirectoryEntry | Entry> {
     newDirName = newDirName || dirName;
 
-    if (/^\//.test(newDirName)) {
+    if ((/^\//.test(newDirName))) {
       let err = new FileError(5);
-      err.message = 'directory cannot start with /';
+      err.message = 'directory cannot start with \/';
       return Promise.reject<any>(err);
     }
 
     return this.resolveDirectoryUrl(path)
-      .then(fse => {
+      .then((fse) => {
         return this.getDirectory(fse, dirName, { create: false });
       })
-      .then(srcde => {
-        return this.resolveDirectoryUrl(newPath).then(deste => {
-          return this.move(srcde, deste, newDirName);
-        });
+      .then((srcde) => {
+        return this.resolveDirectoryUrl(newPath)
+          .then((deste) => {
+            return this.move(srcde, deste, newDirName);
+          });
       });
   }
 
@@ -892,26 +845,22 @@ export class File extends IonicNativePlugin {
    * @returns {Promise<Entry>} Returns a Promise that resolves to the new Entry object or rejects with an error.
    */
   @CordovaCheck()
-  copyDir(
-    path: string,
-    dirName: string,
-    newPath: string,
-    newDirName: string
-  ): Promise<Entry> {
-    if (/^\//.test(newDirName)) {
+  copyDir(path: string, dirName: string, newPath: string, newDirName: string): Promise<Entry> {
+    if ((/^\//.test(newDirName))) {
       let err = new FileError(5);
-      err.message = 'directory cannot start with /';
+      err.message = 'directory cannot start with \/';
       return Promise.reject<any>(err);
     }
 
     return this.resolveDirectoryUrl(path)
-      .then(fse => {
+      .then((fse) => {
         return this.getDirectory(fse, dirName, { create: false });
       })
-      .then(srcde => {
-        return this.resolveDirectoryUrl(newPath).then(deste => {
-          return this.copy(srcde, deste, newDirName);
-        });
+      .then((srcde) => {
+        return this.resolveDirectoryUrl(newPath)
+          .then((deste) => {
+            return this.copy(srcde, deste, newDirName);
+          });
       });
   }
 
@@ -924,20 +873,17 @@ export class File extends IonicNativePlugin {
    */
   @CordovaCheck()
   listDir(path: string, dirName: string): Promise<Entry[]> {
-    if (/^\//.test(dirName)) {
+    if ((/^\//.test(dirName))) {
       let err = new FileError(5);
-      err.message = 'directory cannot start with /';
+      err.message = 'directory cannot start with \/';
       return Promise.reject<Entry[]>(err);
     }
 
     return this.resolveDirectoryUrl(path)
-      .then(fse => {
-        return this.getDirectory(fse, dirName, {
-          create: false,
-          exclusive: false
-        });
+      .then((fse) => {
+        return this.getDirectory(fse, dirName, { create: false, exclusive: false });
       })
-      .then(de => {
+      .then((de) => {
         let reader = de.createReader();
         return this.readEntries(reader);
       });
@@ -952,17 +898,17 @@ export class File extends IonicNativePlugin {
    */
   @CordovaCheck()
   removeRecursively(path: string, dirName: string): Promise<RemoveResult> {
-    if (/^\//.test(dirName)) {
+    if ((/^\//.test(dirName))) {
       let err = new FileError(5);
-      err.message = 'directory cannot start with /';
+      err.message = 'directory cannot start with \/';
       return Promise.reject<RemoveResult>(err);
     }
 
     return this.resolveDirectoryUrl(path)
-      .then(fse => {
+      .then((fse) => {
         return this.getDirectory(fse, dirName, { create: false });
       })
-      .then(de => {
+      .then((de) => {
         return this.rimraf(de);
       });
   }
@@ -976,21 +922,22 @@ export class File extends IonicNativePlugin {
    */
   @CordovaCheck()
   checkFile(path: string, file: string): Promise<boolean> {
-    if (/^\//.test(file)) {
+    if ((/^\//.test(file))) {
       let err = new FileError(5);
-      err.message = 'file cannot start with /';
+      err.message = 'file cannot start with \/';
       return Promise.reject<any>(err);
     }
 
-    return this.resolveLocalFilesystemUrl(path + file).then(fse => {
-      if (fse.isFile) {
-        return true;
-      } else {
-        let err = new FileError(13);
-        err.message = 'input is not a file';
-        return Promise.reject<boolean>(err);
-      }
-    });
+    return this.resolveLocalFilesystemUrl(path + file)
+      .then((fse) => {
+        if (fse.isFile) {
+          return true;
+        } else {
+          let err = new FileError(13);
+          err.message = 'input is not a file';
+          return Promise.reject<boolean>(err);
+        }
+      });
   }
 
   /**
@@ -1004,14 +951,10 @@ export class File extends IonicNativePlugin {
    * @returns {Promise<FileEntry>} Returns a Promise that resolves to a FileEntry or rejects with an error.
    */
   @CordovaCheck()
-  createFile(
-    path: string,
-    fileName: string,
-    replace: boolean
-  ): Promise<FileEntry> {
-    if (/^\//.test(fileName)) {
+  createFile(path: string, fileName: string, replace: boolean): Promise<FileEntry> {
+    if ((/^\//.test(fileName))) {
       let err = new FileError(5);
-      err.message = 'file-name cannot start with /';
+      err.message = 'file-name cannot start with \/';
       return Promise.reject<any>(err);
     }
 
@@ -1023,9 +966,10 @@ export class File extends IonicNativePlugin {
       options.exclusive = true;
     }
 
-    return this.resolveDirectoryUrl(path).then(fse => {
-      return this.getFile(fse, fileName, options);
-    });
+    return this.resolveDirectoryUrl(path)
+      .then((fse) => {
+        return this.getFile(fse, fileName, options);
+      });
   }
 
   /**
@@ -1037,17 +981,17 @@ export class File extends IonicNativePlugin {
    */
   @CordovaCheck()
   removeFile(path: string, fileName: string): Promise<RemoveResult> {
-    if (/^\//.test(fileName)) {
+    if ((/^\//.test(fileName))) {
       let err = new FileError(5);
-      err.message = 'file-name cannot start with /';
+      err.message = 'file-name cannot start with \/';
       return Promise.reject<any>(err);
     }
 
     return this.resolveDirectoryUrl(path)
-      .then(fse => {
+      .then((fse) => {
         return this.getFile(fse, fileName, { create: false });
       })
-      .then(fe => {
+      .then((fe) => {
         return this.remove(fe);
       });
   }
@@ -1061,15 +1005,11 @@ export class File extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves to updated file entry or rejects with an error.
    */
   @CordovaCheck()
-  writeFile(
-    path: string,
-    fileName: string,
-    text: string | Blob | ArrayBuffer,
-    options: IWriteOptions = {}
-  ): Promise<any> {
-    if (/^\//.test(fileName)) {
+  writeFile(path: string, fileName: string,
+            text: string | Blob | ArrayBuffer, options: IWriteOptions = {}): Promise<any> {
+    if ((/^\//.test(fileName))) {
       const err = new FileError(5);
-      err.message = 'file-name cannot start with /';
+      err.message = 'file-name cannot start with \/';
       return Promise.reject(err);
     }
 
@@ -1095,13 +1035,9 @@ export class File extends IonicNativePlugin {
    * @param {IWriteOptions} options replace file if set to true. See WriteOptions for more information.
    * @returns {Promise<FileEntry>} Returns a Promise that resolves to updated file entry or rejects with an error.
    */
-  private writeFileEntry(
-    fe: FileEntry,
-    text: string | Blob | ArrayBuffer,
-    options: IWriteOptions
-  ) {
+  private writeFileEntry(fe: FileEntry, text: string | Blob | ArrayBuffer, options: IWriteOptions) {
     return this.createWriter(fe)
-      .then(writer => {
+      .then((writer) => {
         if (options.append) {
           writer.seek(writer.length);
         }
@@ -1115,6 +1051,7 @@ export class File extends IonicNativePlugin {
       .then(() => fe);
   }
 
+
   /** Write to an existing file.
    *
    * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
@@ -1123,11 +1060,7 @@ export class File extends IonicNativePlugin {
    * @returns {Promise<void>} Returns a Promise that resolves or rejects with an error.
    */
   @CordovaCheck()
-  writeExistingFile(
-    path: string,
-    fileName: string,
-    text: string | Blob
-  ): Promise<void> {
+  writeExistingFile(path: string, fileName: string, text: string | Blob): Promise<void> {
     return this.writeFile(path, fileName, text, { replace: true });
   }
 
@@ -1179,14 +1112,10 @@ export class File extends IonicNativePlugin {
     return this.readFile<ArrayBuffer>(path, file, 'ArrayBuffer');
   }
 
-  private readFile<T>(
-    path: string,
-    file: string,
-    readAs: 'ArrayBuffer' | 'BinaryString' | 'DataURL' | 'Text'
-  ): Promise<T> {
-    if (/^\//.test(file)) {
+  private readFile<T>(path: string, file: string, readAs: 'ArrayBuffer' | 'BinaryString' | 'DataURL' | 'Text'): Promise<T> {
+    if ((/^\//.test(file))) {
       let err = new FileError(5);
-      err.message = 'file-name cannot start with /';
+      err.message = 'file-name cannot start with \/';
       return Promise.reject<any>(err);
     }
 
@@ -1199,7 +1128,7 @@ export class File extends IonicNativePlugin {
         return new Promise<T>((resolve, reject) => {
           reader.onloadend = () => {
             if (reader.result !== undefined || reader.result !== null) {
-              resolve(<T>(<any>reader.result));
+              resolve(<T><any>reader.result);
             } else if (reader.error !== undefined || reader.error !== null) {
               reject(reader.error);
             } else {
@@ -1207,14 +1136,12 @@ export class File extends IonicNativePlugin {
             }
           };
 
-          fileEntry.file(
-            file => {
-              reader[`readAs${readAs}`].call(reader, file);
-            },
-            error => {
-              reject(error);
-            }
-          );
+          fileEntry.file(file => {
+            reader[`readAs${readAs}`].call(reader, file);
+          }, error => {
+            reject(error);
+          });
+
         });
       });
   }
@@ -1229,28 +1156,24 @@ export class File extends IonicNativePlugin {
    * @returns {Promise<Entry>} Returns a Promise that resolves to the new Entry or rejects with an error.
    */
   @CordovaCheck()
-  moveFile(
-    path: string,
-    fileName: string,
-    newPath: string,
-    newFileName: string
-  ): Promise<Entry> {
+  moveFile(path: string, fileName: string, newPath: string, newFileName: string): Promise<Entry> {
     newFileName = newFileName || fileName;
 
-    if (/^\//.test(newFileName)) {
+    if ((/^\//.test(newFileName))) {
       let err = new FileError(5);
-      err.message = 'file name cannot start with /';
+      err.message = 'file name cannot start with \/';
       return Promise.reject<any>(err);
     }
 
     return this.resolveDirectoryUrl(path)
-      .then(fse => {
+      .then((fse) => {
         return this.getFile(fse, fileName, { create: false });
       })
-      .then(srcfe => {
-        return this.resolveDirectoryUrl(newPath).then(deste => {
-          return this.move(srcfe, deste, newFileName);
-        });
+      .then((srcfe) => {
+        return this.resolveDirectoryUrl(newPath)
+          .then((deste) => {
+            return this.move(srcfe, deste, newFileName);
+          });
       });
   }
 
@@ -1264,28 +1187,24 @@ export class File extends IonicNativePlugin {
    * @returns {Promise<Entry>} Returns a Promise that resolves to an Entry or rejects with an error.
    */
   @CordovaCheck()
-  copyFile(
-    path: string,
-    fileName: string,
-    newPath: string,
-    newFileName: string
-  ): Promise<Entry> {
+  copyFile(path: string, fileName: string, newPath: string, newFileName: string): Promise<Entry> {
     newFileName = newFileName || fileName;
 
-    if (/^\//.test(newFileName)) {
+    if ((/^\//.test(newFileName))) {
       let err = new FileError(5);
-      err.message = 'file name cannot start with /';
+      err.message = 'file name cannot start with \/';
       return Promise.reject<any>(err);
     }
 
     return this.resolveDirectoryUrl(path)
-      .then(fse => {
+      .then((fse) => {
         return this.getFile(fse, fileName, { create: false });
       })
-      .then(srcfe => {
-        return this.resolveDirectoryUrl(newPath).then(deste => {
-          return this.copy(srcfe, deste, newFileName);
-        });
+      .then((srcfe) => {
+        return this.resolveDirectoryUrl(newPath)
+          .then((deste) => {
+            return this.copy(srcfe, deste, newFileName);
+          });
       });
   }
 
@@ -1295,7 +1214,7 @@ export class File extends IonicNativePlugin {
   private fillErrorMessage(err: FileError): void {
     try {
       err.message = this.cordovaFileError[err.code];
-    } catch (e) {}
+    } catch (e) { }
   }
 
   /**
@@ -1307,16 +1226,12 @@ export class File extends IonicNativePlugin {
   resolveLocalFilesystemUrl(fileUrl: string): Promise<Entry> {
     return new Promise<Entry>((resolve, reject) => {
       try {
-        window.resolveLocalFileSystemURL(
-          fileUrl,
-          (entry: Entry) => {
-            resolve(entry);
-          },
-          err => {
-            this.fillErrorMessage(err);
-            reject(err);
-          }
-        );
+        window.resolveLocalFileSystemURL(fileUrl, (entry: Entry) => {
+          resolve(entry);
+        }, (err) => {
+          this.fillErrorMessage(err);
+          reject(err);
+        });
       } catch (xc) {
         this.fillErrorMessage(xc);
         reject(xc);
@@ -1331,15 +1246,16 @@ export class File extends IonicNativePlugin {
    */
   @CordovaCheck()
   resolveDirectoryUrl(directoryUrl: string): Promise<DirectoryEntry> {
-    return this.resolveLocalFilesystemUrl(directoryUrl).then(de => {
-      if (de.isDirectory) {
-        return <DirectoryEntry>de;
-      } else {
-        const err = new FileError(13);
-        err.message = 'input is not a directory';
-        return Promise.reject<DirectoryEntry>(err);
-      }
-    });
+    return this.resolveLocalFilesystemUrl(directoryUrl)
+      .then((de) => {
+        if (de.isDirectory) {
+          return <DirectoryEntry>de;
+        } else {
+          const err = new FileError(13);
+          err.message = 'input is not a directory';
+          return Promise.reject<DirectoryEntry>(err);
+        }
+      });
   }
 
   /**
@@ -1350,24 +1266,15 @@ export class File extends IonicNativePlugin {
    * @returns {Promise<DirectoryEntry>}
    */
   @CordovaCheck()
-  getDirectory(
-    directoryEntry: DirectoryEntry,
-    directoryName: string,
-    flags: Flags
-  ): Promise<DirectoryEntry> {
+  getDirectory(directoryEntry: DirectoryEntry, directoryName: string, flags: Flags): Promise<DirectoryEntry> {
     return new Promise<DirectoryEntry>((resolve, reject) => {
       try {
-        directoryEntry.getDirectory(
-          directoryName,
-          flags,
-          de => {
-            resolve(de);
-          },
-          err => {
-            this.fillErrorMessage(err);
-            reject(err);
-          }
-        );
+        directoryEntry.getDirectory(directoryName, flags, (de) => {
+          resolve(de);
+        }, (err) => {
+          this.fillErrorMessage(err);
+          reject(err);
+        });
       } catch (xc) {
         this.fillErrorMessage(xc);
         reject(xc);
@@ -1383,14 +1290,10 @@ export class File extends IonicNativePlugin {
    * @returns {Promise<FileEntry>}
    */
   @CordovaCheck()
-  getFile(
-    directoryEntry: DirectoryEntry,
-    fileName: string,
-    flags: Flags
-  ): Promise<FileEntry> {
+  getFile(directoryEntry: DirectoryEntry, fileName: string, flags: Flags): Promise<FileEntry> {
     return new Promise<FileEntry>((resolve, reject) => {
       try {
-        directoryEntry.getFile(fileName, flags, resolve, err => {
+        directoryEntry.getFile(fileName, flags, resolve, (err) => {
           this.fillErrorMessage(err);
           reject(err);
         });
@@ -1406,61 +1309,40 @@ export class File extends IonicNativePlugin {
    */
   private remove(fe: Entry): Promise<RemoveResult> {
     return new Promise<RemoveResult>((resolve, reject) => {
-      fe.remove(
-        () => {
-          resolve({ success: true, fileRemoved: fe });
-        },
-        err => {
-          this.fillErrorMessage(err);
-          reject(err);
-        }
-      );
+      fe.remove(() => {
+        resolve({ success: true, fileRemoved: fe });
+      }, (err) => {
+        this.fillErrorMessage(err);
+        reject(err);
+      });
     });
   }
 
   /**
    * @hidden
    */
-  private move(
-    srce: Entry,
-    destdir: DirectoryEntry,
-    newName: string
-  ): Promise<Entry> {
+  private move(srce: Entry, destdir: DirectoryEntry, newName: string): Promise<Entry> {
     return new Promise<Entry>((resolve, reject) => {
-      srce.moveTo(
-        destdir,
-        newName,
-        deste => {
-          resolve(deste);
-        },
-        err => {
-          this.fillErrorMessage(err);
-          reject(err);
-        }
-      );
+      srce.moveTo(destdir, newName, (deste) => {
+        resolve(deste);
+      }, (err) => {
+        this.fillErrorMessage(err);
+        reject(err);
+      });
     });
   }
 
   /**
    * @hidden
    */
-  private copy(
-    srce: Entry,
-    destdir: DirectoryEntry,
-    newName: string
-  ): Promise<Entry> {
+  private copy(srce: Entry, destdir: DirectoryEntry, newName: string): Promise<Entry> {
     return new Promise<Entry>((resolve, reject) => {
-      srce.copyTo(
-        destdir,
-        newName,
-        deste => {
-          resolve(deste);
-        },
-        err => {
-          this.fillErrorMessage(err);
-          reject(err);
-        }
-      );
+      srce.copyTo(destdir, newName, (deste) => {
+        resolve(deste);
+      }, (err) => {
+        this.fillErrorMessage(err);
+        reject(err);
+      });
     });
   }
 
@@ -1469,15 +1351,12 @@ export class File extends IonicNativePlugin {
    */
   private readEntries(dr: DirectoryReader): Promise<Entry[]> {
     return new Promise<Entry[]>((resolve, reject) => {
-      dr.readEntries(
-        entries => {
-          resolve(entries);
-        },
-        err => {
-          this.fillErrorMessage(err);
-          reject(err);
-        }
-      );
+      dr.readEntries((entries) => {
+        resolve(entries);
+      }, (err) => {
+        this.fillErrorMessage(err);
+        reject(err);
+      });
     });
   }
 
@@ -1486,15 +1365,12 @@ export class File extends IonicNativePlugin {
    */
   private rimraf(de: DirectoryEntry): Promise<RemoveResult> {
     return new Promise<RemoveResult>((resolve, reject) => {
-      de.removeRecursively(
-        () => {
-          resolve({ success: true, fileRemoved: de });
-        },
-        err => {
-          this.fillErrorMessage(err);
-          reject(err);
-        }
-      );
+      de.removeRecursively(() => {
+        resolve({ success: true, fileRemoved: de });
+      }, (err) => {
+        this.fillErrorMessage(err);
+        reject(err);
+      });
     });
   }
 
@@ -1503,31 +1379,25 @@ export class File extends IonicNativePlugin {
    */
   private createWriter(fe: FileEntry): Promise<FileWriter> {
     return new Promise<FileWriter>((resolve, reject) => {
-      fe.createWriter(
-        writer => {
-          resolve(writer);
-        },
-        err => {
-          this.fillErrorMessage(err);
-          reject(err);
-        }
-      );
+      fe.createWriter((writer) => {
+        resolve(writer);
+      }, (err) => {
+        this.fillErrorMessage(err);
+        reject(err);
+      });
     });
   }
 
   /**
    * @hidden
    */
-  private write(
-    writer: FileWriter,
-    gu: string | Blob | ArrayBuffer
-  ): Promise<any> {
+  private write(writer: FileWriter, gu: string | Blob | ArrayBuffer): Promise<any> {
     if (gu instanceof Blob) {
       return this.writeFileInChunks(writer, gu);
     }
 
     return new Promise<any>((resolve, reject) => {
-      writer.onwriteend = evt => {
+      writer.onwriteend = (evt) => {
         if (writer.error) {
           reject(writer.error);
         } else {
diff --git a/src/@ionic-native/plugins/fingerprint-aio/index.ts b/src/@ionic-native/plugins/fingerprint-aio/index.ts
index 55def10c2..8d414ccb2 100644
--- a/src/@ionic-native/plugins/fingerprint-aio/index.ts
+++ b/src/@ionic-native/plugins/fingerprint-aio/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
 
 export interface FingerprintOptions {
   /**
@@ -65,14 +66,13 @@ export interface FingerprintOptions {
 })
 @Injectable()
 export class FingerprintAIO extends IonicNativePlugin {
+
   /**
    * Check if fingerprint authentication is available
    * @return {Promise<any>} Returns a promise with result
    */
   @Cordova()
-  isAvailable(): Promise<any> {
-    return;
-  }
+  isAvailable(): Promise<any> { return; }
 
   /**
    * Show authentication dialogue
@@ -80,7 +80,6 @@ export class FingerprintAIO extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when authentication was successfull
    */
   @Cordova()
-  show(options: FingerprintOptions): Promise<any> {
-    return;
-  }
+  show(options: FingerprintOptions): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/firebase-analytics/index.ts b/src/@ionic-native/plugins/firebase-analytics/index.ts
index 7755f7d4a..5cdac8fd4 100644
--- a/src/@ionic-native/plugins/firebase-analytics/index.ts
+++ b/src/@ionic-native/plugins/firebase-analytics/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @beta
@@ -35,6 +35,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class FirebaseAnalytics extends IonicNativePlugin {
+
   /**
    * Logs an app event.
    * Be aware of automatically collected events.
@@ -43,9 +44,7 @@ export class FirebaseAnalytics extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({ sync: true })
-  logEvent(name: string, params: any): Promise<any> {
-    return;
-  }
+  logEvent(name: string, params: any): Promise<any> { return; }
 
   /**
    * Sets the user ID property.
@@ -54,9 +53,7 @@ export class FirebaseAnalytics extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({ sync: true })
-  setUserId(id: string): Promise<any> {
-    return;
-  }
+  setUserId(id: string): Promise<any> { return; }
 
   /**
    * This feature must be used in accordance with Google's Privacy Policy.
@@ -66,9 +63,7 @@ export class FirebaseAnalytics extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({ sync: true })
-  setUserProperty(name: string, value: string): Promise<any> {
-    return;
-  }
+  setUserProperty(name: string, value: string): Promise<any> { return; }
 
   /**
    * Sets whether analytics collection is enabled for this app on this device.
@@ -76,9 +71,7 @@ export class FirebaseAnalytics extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({ sync: true })
-  setEnabled(enabled: boolean): Promise<any> {
-    return;
-  }
+  setEnabled(enabled: boolean): Promise<any> { return; }
 
   /**
    * Sets the current screen name, which specifies the current visual context in your app.
@@ -87,7 +80,6 @@ export class FirebaseAnalytics extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({ sync: true })
-  setCurrentScreen(name: string): Promise<any> {
-    return;
-  }
+  setCurrentScreen(name: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/firebase-dynamic-links/index.ts b/src/@ionic-native/plugins/firebase-dynamic-links/index.ts
index f3b7eb83a..00bc7cbda 100644
--- a/src/@ionic-native/plugins/firebase-dynamic-links/index.ts
+++ b/src/@ionic-native/plugins/firebase-dynamic-links/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface DynamicLinksOptions {
   title: string;
@@ -66,21 +66,19 @@ export interface DynamicLinksOptions {
   plugin: ' cordova-plugin-firebase-dynamiclinks',
   pluginRef: 'cordova.plugins.firebase.dynamiclinks',
   repo: 'https://github.com/chemerisuk/cordova-plugin-firebase-dynamiclinks',
-  install:
-    'ionic cordova plugin add cordova-plugin-firebase-dynamiclinks --save --variable APP_DOMAIN="example.com" --variable APP_PATH="/"',
+  install: 'ionic cordova plugin add cordova-plugin-firebase-dynamiclinks --save --variable APP_DOMAIN="example.com" --variable APP_PATH="/"',
   installVariables: ['APP_DOMAIN', 'APP_PATH'],
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class FirebaseDynamicLinks extends IonicNativePlugin {
+
   /**
    * Registers callback that is triggered on each dynamic link click.
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  onDynamicLink(): Promise<any> {
-    return;
-  }
+  onDynamicLink(): Promise<any> { return; }
 
   /**
    * Display invitation dialog.
@@ -88,7 +86,6 @@ export class FirebaseDynamicLinks extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  sendInvitation(options: DynamicLinksOptions): Promise<any> {
-    return;
-  }
+  sendInvitation(options: DynamicLinksOptions): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/firebase/index.ts b/src/@ionic-native/plugins/firebase/index.ts
index 9172628fa..60d29c219 100644
--- a/src/@ionic-native/plugins/firebase/index.ts
+++ b/src/@ionic-native/plugins/firebase/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -30,7 +30,7 @@ import { Observable } from 'rxjs/Observable';
   plugin: 'cordova-plugin-firebase',
   pluginRef: 'FirebasePlugin',
   repo: 'https://github.com/arnesson/cordova-plugin-firebase',
-  platforms: ['Android', 'iOS']
+  platforms: ['Android', 'iOS'],
 })
 @Injectable()
 export class Firebase extends IonicNativePlugin {
@@ -297,10 +297,7 @@ export class Firebase extends IonicNativePlugin {
     successIndex: 2,
     errorIndex: 3
   })
-  verifyPhoneNumber(
-    phoneNumber: string,
-    timeoutDuration: number
-  ): Promise<any> {
+  verifyPhoneNumber(phoneNumber: string, timeoutDuration: number): Promise<any> {
     return;
   }
 
diff --git a/src/@ionic-native/plugins/flashlight/index.ts b/src/@ionic-native/plugins/flashlight/index.ts
index 91c055a5b..01cce2148 100644
--- a/src/@ionic-native/plugins/flashlight/index.ts
+++ b/src/@ionic-native/plugins/flashlight/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Flashlight
@@ -28,41 +28,35 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Flashlight extends IonicNativePlugin {
+
   /**
    * Checks if the flashlight is available
    * @returns {Promise<boolean>} Returns a promise that resolves with a boolean stating if the flashlight is available.
    */
   @Cordova()
-  available(): Promise<boolean> {
-    return;
-  }
+  available(): Promise<boolean> { return; }
 
   /**
    * Switches the flashlight on
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  switchOn(): Promise<boolean> {
-    return;
-  }
+  switchOn(): Promise<boolean> { return; }
 
   /**
    * Switches the flashlight off
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  switchOff(): Promise<boolean> {
-    return;
-  }
+  switchOff(): Promise<boolean> { return; }
 
   /**
    * Toggles the flashlight
    * @returns {Promise<any>}
    */
   @Cordova()
-  toggle(): Promise<any> {
-    return;
-  }
+  toggle(): Promise<any> { return; }
+
 
   /**
    * Checks if the flashlight is turned on.
@@ -71,7 +65,6 @@ export class Flashlight extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  isSwitchedOn(): boolean {
-    return;
-  }
+  isSwitchedOn(): boolean { return; }
+
 }
diff --git a/src/@ionic-native/plugins/flurry-analytics/index.ts b/src/@ionic-native/plugins/flurry-analytics/index.ts
index 980850b28..6116dd195 100644
--- a/src/@ionic-native/plugins/flurry-analytics/index.ts
+++ b/src/@ionic-native/plugins/flurry-analytics/index.ts
@@ -1,10 +1,5 @@
+import { Plugin, CordovaInstance, checkAvailability, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import {
-  checkAvailability,
-  CordovaInstance,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 
 export interface FlurryAnalyticsOptions {
   /** Flurry API key is required */
@@ -78,10 +73,11 @@ export interface FlurryAnalyticsLocation {
 }
 
 /**
- * @hidden
- */
+* @hidden
+*/
 export class FlurryAnalyticsObject {
-  constructor(private _objectInstance: any) {}
+
+  constructor(private _objectInstance: any) { }
 
   /**
    * This function set the Event
@@ -153,10 +149,7 @@ export class FlurryAnalyticsObject {
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  setLocation(
-    location: FlurryAnalyticsLocation,
-    message: string
-  ): Promise<any> {
+  setLocation(location: FlurryAnalyticsLocation, message: string): Promise<any> {
     return;
   }
 
@@ -179,6 +172,7 @@ export class FlurryAnalyticsObject {
   endSession(): Promise<any> {
     return;
   }
+
 }
 
 /**
@@ -222,24 +216,22 @@ export class FlurryAnalyticsObject {
 })
 @Injectable()
 export class FlurryAnalytics extends IonicNativePlugin {
+
   /**
    * Creates a new instance of FlurryAnalyticsObject
    * @param options {FlurryAnalyticsOptions} options
    * @return {FlurryAnalyticsObject}
    */
   create(options: FlurryAnalyticsOptions): FlurryAnalyticsObject {
+
     let instance: any;
 
-    if (
-      checkAvailability(
-        FlurryAnalytics.pluginRef,
-        null,
-        FlurryAnalytics.pluginName
-      ) === true
-    ) {
+    if (checkAvailability(FlurryAnalytics.pluginRef, null, FlurryAnalytics.pluginName) === true) {
       instance = new (window as any).FlurryAnalytics(options);
     }
 
     return new FlurryAnalyticsObject(instance);
+
   }
+
 }
diff --git a/src/@ionic-native/plugins/ftp/index.ts b/src/@ionic-native/plugins/ftp/index.ts
index 820a70fd0..c2c3be5ae 100644
--- a/src/@ionic-native/plugins/ftp/index.ts
+++ b/src/@ionic-native/plugins/ftp/index.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Observable } from 'rxjs';
 
 /**
  * @name FTP
@@ -32,19 +32,18 @@ import { Observable } from 'rxjs/Observable';
 })
 @Injectable()
 export class FTP extends IonicNativePlugin {
+
   /**
-   * Connect to one ftp server.
-   *
-   * Just need to init the connection once. If success, you can do any ftp actions later.
-   * @param hostname {string} The ftp server url. Like ip without protocol prefix, e.g. "192.168.1.1".
-   * @param username {string} The ftp login username. If it and `password` are all blank/undefined, the default username "anonymous" is used.
-   * @param password {string} The ftp login password. If it and `username` are all blank/undefined, the default password "anonymous@" is used.
-   * @return {Promise<any>} The success callback. Notice: For iOS, if triggered, means `init` success, but NOT means the later action, e.g. `ls`... `download` will success!
-   */
+  * Connect to one ftp server.
+  *
+  * Just need to init the connection once. If success, you can do any ftp actions later.
+  * @param hostname {string} The ftp server url. Like ip without protocol prefix, e.g. "192.168.1.1".
+  * @param username {string} The ftp login username. If it and `password` are all blank/undefined, the default username "anonymous" is used.
+  * @param password {string} The ftp login password. If it and `username` are all blank/undefined, the default password "anonymous@" is used.
+  * @return {Promise<any>} The success callback. Notice: For iOS, if triggered, means `init` success, but NOT means the later action, e.g. `ls`... `download` will success!
+  */
   @Cordova()
-  connect(hostname: string, username: string, password: string): Promise<any> {
-    return;
-  }
+  connect(hostname: string, username: string, password: string): Promise<any> { return; }
 
   /**
    * List files (with info of `name`, `type`, `link`, `size`, `modifiedDate`) under one directory on the ftp server.
@@ -61,9 +60,7 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  ls(path: string): Promise<any> {
-    return;
-  }
+  ls(path: string): Promise<any> { return; }
 
   /**
    * Create one directory on the ftp server.
@@ -72,9 +69,7 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  mkdir(path: string): Promise<any> {
-    return;
-  }
+  mkdir(path: string): Promise<any> { return; }
 
   /**
    * Delete one directory on the ftp server.
@@ -85,9 +80,7 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  rmdir(path: string): Promise<any> {
-    return;
-  }
+  rmdir(path: string): Promise<any> { return; }
 
   /**
    * Delete one file on the ftp server.
@@ -96,9 +89,7 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  rm(file: string): Promise<any> {
-    return;
-  }
+  rm(file: string): Promise<any> { return; }
 
   /**
    * Upload one local file to the ftp server.
@@ -112,9 +103,7 @@ export class FTP extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  upload(localFile: string, remoteFile: string): Observable<any> {
-    return;
-  }
+  upload(localFile: string, remoteFile: string): Observable<any> { return; }
 
   /**
    * Download one remote file on the ftp server to local path.
@@ -128,9 +117,7 @@ export class FTP extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  download(localFile: string, remoteFile: string): Observable<any> {
-    return;
-  }
+  download(localFile: string, remoteFile: string): Observable<any> { return; }
 
   /**
    * Cancel all requests. Always success.
@@ -138,9 +125,7 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  cancel(): Promise<any> {
-    return;
-  }
+  cancel(): Promise<any> { return; }
 
   /**
    * Disconnect from ftp server.
@@ -148,7 +133,6 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  disconnect(): Promise<any> {
-    return;
-  }
+  disconnect(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/geofence/index.ts b/src/@ionic-native/plugins/geofence/index.ts
index 46dcffe32..a906aca88 100644
--- a/src/@ionic-native/plugins/geofence/index.ts
+++ b/src/@ionic-native/plugins/geofence/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaFunctionOverride,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, Plugin, CordovaFunctionOverride, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare const window: any;
@@ -89,6 +84,7 @@ declare const window: any;
 })
 @Injectable()
 export class Geofence extends IonicNativePlugin {
+
   TransitionType = {
     ENTER: 1,
     EXIT: 2,
@@ -100,9 +96,7 @@ export class Geofence extends IonicNativePlugin {
    * @return {Observable<any>}
    */
   @CordovaFunctionOverride()
-  onTransitionReceived(): Observable<any> {
-    return;
-  }
+  onTransitionReceived(): Observable<any> { return; };
 
   /**
    * Initializes the plugin. User will be prompted to allow the app to use location and notifications.
@@ -110,9 +104,7 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Promise<void>}
    */
   @Cordova()
-  initialize(): Promise<void> {
-    return;
-  }
+  initialize(): Promise<void> { return; };
 
   /**
    * Adds a new geofence or array of geofences. For geofence object, see above.
@@ -120,9 +112,7 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Promise<void>}
    */
   @Cordova()
-  addOrUpdate(geofences: Object | Array<Object>): Promise<void> {
-    return;
-  }
+  addOrUpdate(geofences: Object | Array<Object>): Promise<void> { return; };
 
   /**
    * Removes a geofence or array of geofences. `geofenceID` corresponds to one or more IDs specified when the
@@ -131,9 +121,7 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Promise<void>}
    */
   @Cordova()
-  remove(geofenceId: string | Array<string>): Promise<void> {
-    return;
-  }
+  remove(geofenceId: string | Array<string>): Promise<void> { return; };
 
   /**
    * Removes all geofences.
@@ -141,9 +129,7 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Promise<void>}
    */
   @Cordova()
-  removeAll(): Promise<void> {
-    return;
-  }
+  removeAll(): Promise<void> { return; };
 
   /**
    * Returns an array of geofences currently being monitored.
@@ -151,9 +137,7 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Promise<Array<string>>}
    */
   @Cordova()
-  getWatched(): Promise<string> {
-    return;
-  }
+  getWatched(): Promise<string> { return; };
 
   /**
    * Called when the user clicks a geofence notification. iOS and Android only.
@@ -161,11 +145,12 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Observable<any>}
    */
   onNotificationClicked(): Observable<any> {
-    return new Observable<any>(observer => {
-      window &&
-        window.geofence &&
-        (window.geofence.onNotificationClicked = observer.next.bind(observer));
-      return () => (window.geofence.onNotificationClicked = () => {});
+
+    return new Observable<any>((observer) => {
+      window && window.geofence && (window.geofence.onNotificationClicked = observer.next.bind(observer));
+      return () => window.geofence.onNotificationClicked = () => { };
     });
+
   }
+
 }
diff --git a/src/@ionic-native/plugins/geolocation/index.ts b/src/@ionic-native/plugins/geolocation/index.ts
index c08a3e4a6..7eded999a 100644
--- a/src/@ionic-native/plugins/geolocation/index.ts
+++ b/src/@ionic-native/plugins/geolocation/index.ts
@@ -1,10 +1,11 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare const navigator: any;
 
 export interface Coordinates {
+
   /**
    * a double representing the position's latitude in decimal degrees.
    */
@@ -48,6 +49,7 @@ export interface Coordinates {
    * This value can be null.
    */
   speed: number;
+
 }
 
 export interface Geoposition {
@@ -63,6 +65,7 @@ export interface Geoposition {
 }
 
 export interface PositionError {
+
   /**
    * A code that indicates the error that occurred
    */
@@ -72,9 +75,11 @@ export interface PositionError {
    * A message that can describe the error that occurred
    */
   message: string;
+
 }
 
 export interface GeolocationOptions {
+
   /**
    * Is a positive long value indicating the maximum age in milliseconds of a
    * possible cached position that is acceptable to return. If set to 0, it
@@ -102,6 +107,7 @@ export interface GeolocationOptions {
    * @type {boolean}
    */
   enableHighAccuracy?: boolean;
+
 }
 
 /**
@@ -147,13 +153,13 @@ export interface GeolocationOptions {
   plugin: 'cordova-plugin-geolocation',
   pluginRef: 'navigator.geolocation',
   repo: 'https://github.com/apache/cordova-plugin-geolocation',
-  install:
-    'ionic cordova plugin add cordova-plugin-geolocation --variable GEOLOCATION_USAGE_DESCRIPTION="To locate you"',
+  install: 'ionic cordova plugin add cordova-plugin-geolocation --variable GEOLOCATION_USAGE_DESCRIPTION="To locate you"',
   installVariables: ['GEOLOCATION_USAGE_DESCRIPTION'],
   platforms: ['Amazon Fire OS', 'Android', 'Browser', 'iOS', 'Windows']
 })
 @Injectable()
 export class Geolocation extends IonicNativePlugin {
+
   /**
    * Get the device's current position.
    *
@@ -163,9 +169,7 @@ export class Geolocation extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> {
-    return;
-  }
+  getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> { return; }
 
   /**
    * Watch the current device's position.  Clear the watch by unsubscribing from
@@ -186,13 +190,12 @@ export class Geolocation extends IonicNativePlugin {
    * @returns {Observable<Geoposition>} Returns an Observable that notifies with the [position](https://developer.mozilla.org/en-US/docs/Web/API/Position) of the device, or errors.
    */
   watchPosition(options?: GeolocationOptions): Observable<Geoposition> {
-    return new Observable<Geoposition>((observer: any) => {
-      let watchId = navigator.geolocation.watchPosition(
-        observer.next.bind(observer),
-        observer.next.bind(observer),
-        options
-      );
-      return () => navigator.geolocation.clearWatch(watchId);
-    });
+    return new Observable<Geoposition>(
+      (observer: any) => {
+        let watchId = navigator.geolocation.watchPosition(observer.next.bind(observer), observer.next.bind(observer), options);
+        return () => navigator.geolocation.clearWatch(watchId);
+      }
+    );
   }
+
 }
diff --git a/src/@ionic-native/plugins/globalization/index.ts b/src/@ionic-native/plugins/globalization/index.ts
index 01e4d1ad5..0acecdd92 100644
--- a/src/@ionic-native/plugins/globalization/index.ts
+++ b/src/@ionic-native/plugins/globalization/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Globalization
@@ -36,23 +36,20 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Globalization extends IonicNativePlugin {
+
   /**
    * Returns the BCP-47 compliant language identifier tag to the successCallback with a properties object as a parameter. That object should have a value property with a String value.
    * @returns {Promise<{value: string}>}
    */
   @Cordova()
-  getPreferredLanguage(): Promise<{ value: string }> {
-    return;
-  }
+  getPreferredLanguage(): Promise<{ value: string }> { return; }
 
   /**
    * Returns the BCP 47 compliant locale identifier string to the successCallback with a properties object as a parameter.
    * @returns {Promise<{value: string}>}
    */
   @Cordova()
-  getLocaleName(): Promise<{ value: string }> {
-    return;
-  }
+  getLocaleName(): Promise<{ value: string }> { return; }
 
   /**
    * Converts date to string
@@ -64,12 +61,7 @@ export class Globalization extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  dateToString(
-    date: Date,
-    options: { formatLength: string; selector: string }
-  ): Promise<{ value: string }> {
-    return;
-  }
+  dateToString(date: Date, options: { formatLength: string, selector: string }): Promise<{ value: string }> { return; }
 
   /**
    * Parses a date formatted as a string, according to the client's user preferences and calendar using the time zone of the client, and returns the corresponding date object.
@@ -81,20 +73,7 @@ export class Globalization extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  stringToDate(
-    dateString: string,
-    options: { formatLength: string; selector: string }
-  ): Promise<{
-    year: number;
-    month: number;
-    day: number;
-    hour: number;
-    minute: number;
-    second: number;
-    millisecond: number;
-  }> {
-    return;
-  }
+  stringToDate(dateString: string, options: { formatLength: string, selector: string }): Promise<{ year: number, month: number, day: number, hour: number, minute: number, second: number, millisecond: number }> { return; }
 
   /**
    * Returns a pattern string to format and parse dates according to the client's user preferences.
@@ -104,17 +83,7 @@ export class Globalization extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getDatePattern(options: {
-    formatLength: string;
-    selector: string;
-  }): Promise<{
-    pattern: string;
-    timezone: string;
-    utf_offset: number;
-    dst_offset: number;
-  }> {
-    return;
-  }
+  getDatePattern(options: { formatLength: string, selector: string }): Promise<{ pattern: string, timezone: string, utf_offset: number, dst_offset: number }> { return; }
 
   /**
    * Returns an array of the names of the months or days of the week, depending on the client's user preferences and calendar.
@@ -124,12 +93,7 @@ export class Globalization extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getDateNames(options: {
-    type: string;
-    item: string;
-  }): Promise<{ value: Array<string> }> {
-    return;
-  }
+  getDateNames(options: { type: string, item: string }): Promise<{ value: Array<string> }> { return; }
 
   /**
    * Indicates whether daylight savings time is in effect for a given date using the client's time zone and calendar.
@@ -137,18 +101,14 @@ export class Globalization extends IonicNativePlugin {
    * @returns {Promise<{dst: string}>} reutrns a promise with the value
    */
   @Cordova()
-  isDayLightSavingsTime(date: Date): Promise<{ dst: string }> {
-    return;
-  }
+  isDayLightSavingsTime(date: Date): Promise<{ dst: string }> { return; }
 
   /**
    * Returns the first day of the week according to the client's user preferences and calendar.
    * @returns {Promise<{value: string}>} returns a promise with the value
    */
   @Cordova()
-  getFirstDayOfWeek(): Promise<{ value: string }> {
-    return;
-  }
+  getFirstDayOfWeek(): Promise<{ value: string }> { return; }
 
   /**
    * Returns a number formatted as a string according to the client's user preferences.
@@ -159,12 +119,7 @@ export class Globalization extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  numberToString(
-    numberToConvert: number,
-    options: { type: string }
-  ): Promise<{ value: string }> {
-    return;
-  }
+  numberToString(numberToConvert: number, options: { type: string }): Promise<{ value: string }> { return; }
 
   /**
    *
@@ -176,12 +131,7 @@ export class Globalization extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  stringToNumber(
-    stringToConvert: string,
-    options: { type: string }
-  ): Promise<{ value: number | string }> {
-    return;
-  }
+  stringToNumber(stringToConvert: string, options: { type: string }): Promise<{ value: number | string }> { return; }
 
   /**
    * Returns a pattern string to format and parse numbers according to the client's user preferences.
@@ -191,20 +141,7 @@ export class Globalization extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getNumberPattern(options: {
-    type: string;
-  }): Promise<{
-    pattern: string;
-    symbol: string;
-    fraction: number;
-    rounding: number;
-    positive: string;
-    negative: string;
-    decimal: string;
-    grouping: string;
-  }> {
-    return;
-  }
+  getNumberPattern(options: { type: string }): Promise<{ pattern: string, symbol: string, fraction: number, rounding: number, positive: string, negative: string, decimal: string, grouping: string }> { return; }
 
   /**
    * Returns a pattern string to format and parse currency values according to the client's user preferences and ISO 4217 currency code.
@@ -212,16 +149,6 @@ export class Globalization extends IonicNativePlugin {
    * @returns {Promise<{ pattern: string, code: string, fraction: number, rounding: number, decimal: number, grouping: string }>}
    */
   @Cordova()
-  getCurrencyPattern(
-    currencyCode: string
-  ): Promise<{
-    pattern: string;
-    code: string;
-    fraction: number;
-    rounding: number;
-    decimal: number;
-    grouping: string;
-  }> {
-    return;
-  }
+  getCurrencyPattern(currencyCode: string): Promise<{ pattern: string, code: string, fraction: number, rounding: number, decimal: number, grouping: string }> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/google-analytics/index.ts b/src/@ionic-native/plugins/google-analytics/index.ts
index 83c65eae7..1b7fe31ee 100644
--- a/src/@ionic-native/plugins/google-analytics/index.ts
+++ b/src/@ionic-native/plugins/google-analytics/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Google Analytics
diff --git a/src/@ionic-native/plugins/google-maps/index.ts b/src/@ionic-native/plugins/google-maps/index.ts
index 172fbadfb..3d875b2b5 100644
--- a/src/@ionic-native/plugins/google-maps/index.ts
+++ b/src/@ionic-native/plugins/google-maps/index.ts
@@ -1,29 +1,16 @@
+import { Injectable } from '@angular/core';
+import { CordovaCheck, CordovaInstance, Plugin, InstanceProperty, InstanceCheck, checkAvailability, IonicNativePlugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromEvent';
 
-import { Injectable } from '@angular/core';
-import {
-  checkAvailability,
-  CordovaCheck,
-  CordovaInstance,
-  InstanceCheck,
-  InstanceProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
 
-export type MapType =
-  | 'MAP_TYPE_NORMAL'
-  | 'MAP_TYPE_ROADMAP'
-  | 'MAP_TYPE_SATELLITE'
-  | 'MAP_TYPE_HYBRID'
-  | 'MAP_TYPE_TERRAIN'
-  | 'MAP_TYPE_NONE';
+export type MapType = 'MAP_TYPE_NORMAL' | 'MAP_TYPE_ROADMAP' | 'MAP_TYPE_SATELLITE' | 'MAP_TYPE_HYBRID' | 'MAP_TYPE_TERRAIN' | 'MAP_TYPE_NONE';
 
 /**
  * @hidden
  */
 export class LatLng implements ILatLng {
+
   lat: number;
   lng: number;
 
@@ -56,6 +43,7 @@ export interface ILatLngBounds {
  * @hidden
  */
 export class LatLngBounds implements ILatLngBounds {
+
   private _objectInstance: any;
 
   @InstanceProperty northeast: ILatLng;
@@ -71,9 +59,7 @@ export class LatLngBounds implements ILatLngBounds {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  toString(): string {
-    return;
-  }
+  toString(): string { return; }
 
   /**
    * Returns a string of the form "lat_sw,lng_sw,lat_ne,lng_ne" for this bounds, where "sw" corresponds to the southwest corner of the bounding box, while "ne" corresponds to the northeast corner of that box.
@@ -81,9 +67,7 @@ export class LatLngBounds implements ILatLngBounds {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  toUrlValue(precision?: number): string {
-    return;
-  }
+  toUrlValue(precision?: number): string { return; }
 
   /**
    * Extends this bounds to contain the given point.
@@ -97,21 +81,18 @@ export class LatLngBounds implements ILatLngBounds {
    * @param LatLng {ILatLng}
    */
   @CordovaInstance({ sync: true })
-  contains(LatLng: ILatLng): boolean {
-    return;
-  }
+  contains(LatLng: ILatLng): boolean { return; }
 
   /**
    * Computes the center of this LatLngBounds
    * @return {LatLng}
    */
   @CordovaInstance({ sync: true })
-  getCenter(): LatLng {
-    return;
-  }
+  getCenter(): LatLng { return; }
 }
 
 export interface GoogleMapControlOptions {
+
   /**
    * Turns the compass on or off.
    */
@@ -151,6 +132,7 @@ export interface GoogleMapControlOptions {
 }
 
 export interface GoogleMapGestureOptions {
+
   /**
    * Set false to disable the scroll gesture (default: true)
    */
@@ -190,6 +172,7 @@ export interface GoogleMapPaddingOptions {
 }
 
 export interface GoogleMapPreferenceOptions {
+
   /**
    * Minimum and maximum zoom levels for zooming gestures.
    */
@@ -212,6 +195,7 @@ export interface GoogleMapPreferenceOptions {
 }
 
 export interface GoogleMapOptions {
+
   /**
    * mapType [options]
    */
@@ -344,6 +328,7 @@ export interface CircleOptions {
 }
 
 export interface GeocoderRequest {
+
   /**
    * The address property or position property is required.
    * You can not specify both property at the same time.
@@ -390,7 +375,7 @@ export interface GeocoderResult {
     lines?: Array<string>;
     permises?: string;
     phone?: string;
-    url?: string;
+    url?: string
   };
   locale?: string;
   locality?: string;
@@ -747,6 +732,7 @@ export interface ToDataUrlOptions {
   uncompress?: boolean;
 }
 
+
 /**
  * Options for map.addKmlOverlay() method
  */
@@ -772,6 +758,7 @@ export interface KmlOverlayOptions {
   [key: string]: any;
 }
 
+
 /**
  * @hidden
  */
@@ -815,22 +802,8 @@ export class VisibleRegion implements ILatLngBounds {
    */
   @InstanceProperty type: string;
 
-  constructor(
-    southwest: LatLngBounds,
-    northeast: LatLngBounds,
-    farLeft: ILatLng,
-    farRight: ILatLng,
-    nearLeft: ILatLng,
-    nearRight: ILatLng
-  ) {
-    this._objectInstance = new (GoogleMaps.getPlugin()).VisibleRegion(
-      southwest,
-      northeast,
-      farLeft,
-      farRight,
-      nearLeft,
-      nearRight
-    );
+  constructor(southwest: LatLngBounds, northeast: LatLngBounds, farLeft: ILatLng, farRight: ILatLng, nearLeft: ILatLng, nearRight: ILatLng) {
+    this._objectInstance = new (GoogleMaps.getPlugin()).VisibleRegion(southwest, northeast, farLeft, farRight, nearLeft, nearRight);
   }
 
   /**
@@ -838,9 +811,7 @@ export class VisibleRegion implements ILatLngBounds {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  toString(): string {
-    return;
-  }
+  toString(): string { return; }
 
   /**
    * Returns a string of the form "lat_sw,lng_sw,lat_ne,lng_ne" for this bounds, where "sw" corresponds to the southwest corner of the bounding box, while "ne" corresponds to the northeast corner of that box.
@@ -848,18 +819,16 @@ export class VisibleRegion implements ILatLngBounds {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  toUrlValue(precision?: number): string {
-    return;
-  }
+  toUrlValue(precision?: number): string { return; }
+
 
   /**
    * Returns true if the given lat/lng is in this bounds.
    * @param LatLng {ILatLng}
    */
   @CordovaInstance({ sync: true })
-  contains(LatLng: ILatLng): boolean {
-    return;
-  }
+  contains(LatLng: ILatLng): boolean { return; }
+
 }
 
 /**
@@ -900,7 +869,7 @@ export const GoogleMapsEvent = {
 /**
  * @hidden
  */
-export const GoogleMapsAnimation: { [animationName: string]: string } = {
+export const GoogleMapsAnimation: { [animationName: string]: string; } = {
   BOUNCE: 'BOUNCE',
   DROP: 'DROP'
 };
@@ -908,7 +877,7 @@ export const GoogleMapsAnimation: { [animationName: string]: string } = {
 /**
  * @hidden
  */
-export const GoogleMapsMapTypeId: { [mapType: string]: MapType } = {
+export const GoogleMapsMapTypeId: { [mapType: string]: MapType; } = {
   NORMAL: 'MAP_TYPE_NORMAL',
   ROADMAP: 'MAP_TYPE_ROADMAP',
   SATELLITE: 'MAP_TYPE_SATELLITE',
@@ -1035,33 +1004,24 @@ export const GoogleMapsMapTypeId: { [mapType: string]: MapType } = {
   pluginRef: 'plugin.google.maps',
   plugin: 'cordova-plugin-googlemaps',
   repo: 'https://github.com/mapsplugin/cordova-plugin-googlemaps',
-  document:
-    'https://github.com/mapsplugin/cordova-plugin-googlemaps-doc/blob/master/v2.0.0/README.md',
-  install:
-    'ionic cordova plugin add cordova-plugin-googlemaps --variable API_KEY_FOR_ANDROID="YOUR_ANDROID_API_KEY_IS_HERE" --variable API_KEY_FOR_IOS="YOUR_IOS_API_KEY_IS_HERE"',
+  document: 'https://github.com/mapsplugin/cordova-plugin-googlemaps-doc/blob/master/v2.0.0/README.md',
+  install: 'ionic cordova plugin add cordova-plugin-googlemaps --variable API_KEY_FOR_ANDROID="YOUR_ANDROID_API_KEY_IS_HERE" --variable API_KEY_FOR_IOS="YOUR_IOS_API_KEY_IS_HERE"',
   installVariables: ['API_KEY_FOR_ANDROID', 'API_KEY_FOR_IOS'],
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class GoogleMaps extends IonicNativePlugin {
+
   /**
    * Creates a new GoogleMap instance
    * @param element {string | HTMLElement} Element ID or reference to attach the map to
    * @param options {GoogleMapOptions} [options] Options
    * @return {GoogleMap}
    */
-  static create(
-    element: string | HTMLElement | GoogleMapOptions,
-    options?: GoogleMapOptions
-  ): GoogleMap {
+  static create(element: string | HTMLElement | GoogleMapOptions, options?: GoogleMapOptions): GoogleMap {
     if (element instanceof HTMLElement) {
       if (element.getAttribute('__pluginMapId')) {
-        console.error(
-          'GoogleMaps',
-          `${element.tagName}[__pluginMapId='${element.getAttribute(
-            '__pluginMapId'
-          )}'] has already map.`
-        );
+        console.error('GoogleMaps', element.tagName + '[__pluginMapId=\'' + element.getAttribute('__pluginMapId') +  '\'] has already map.');
         return;
       }
     } else if (typeof element === 'object') {
@@ -1077,13 +1037,11 @@ export class GoogleMaps extends IonicNativePlugin {
    * @deprecation
    * @hidden
    */
-  create(
-    element: string | HTMLElement | GoogleMapOptions,
-    options?: GoogleMapOptions
-  ): GoogleMap {
+  create(element: string | HTMLElement | GoogleMapOptions, options?: GoogleMapOptions): GoogleMap {
     console.error('GoogleMaps', '[deprecated] Please use GoogleMaps.create()');
     return GoogleMaps.create(element, options);
   }
+
 }
 
 /**
@@ -1106,7 +1064,7 @@ export class BaseClass {
    */
   @InstanceCheck({ observable: true })
   addEventListener(eventName: string): Observable<any> {
-    return new Observable(observer => {
+    return new Observable((observer) => {
       this._objectInstance.on(eventName, (...args: any[]) => {
         if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) {
           if (args[args.length - 1].type === 'Map') {
@@ -1125,9 +1083,7 @@ export class BaseClass {
             }
             args[args.length - 1] = overlay;
           } else {
-            args[args.length - 1] = this._objectInstance
-              .getMap()
-              .get('_overlays')[args[args.length - 1].getId()];
+            args[args.length - 1] = this._objectInstance.getMap().get('_overlays')[args[args.length - 1].getId()];
           }
         }
         observer.next(args);
@@ -1142,7 +1098,7 @@ export class BaseClass {
    */
   @InstanceCheck()
   addListenerOnce(eventName: string): Promise<any> {
-    return new Promise<any>(resolve => {
+    return new Promise<any>((resolve) => {
       this._objectInstance.one(eventName, (...args: any[]) => {
         if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) {
           if (args[args.length - 1].type === 'Map') {
@@ -1161,9 +1117,7 @@ export class BaseClass {
             }
             args[args.length - 1] = overlay;
           } else {
-            args[args.length - 1] = this._objectInstance
-              .getMap()
-              .get('_overlays')[args[args.length - 1].getId()];
+            args[args.length - 1] = this._objectInstance.getMap().get('_overlays')[args[args.length - 1].getId()];
           }
         }
         resolve(args);
@@ -1176,9 +1130,7 @@ export class BaseClass {
    * @param key {any}
    */
   @CordovaInstance({ sync: true })
-  get(key: string): any {
-    return;
-  }
+  get(key: string): any { return; }
 
   /**
    * Sets a value
@@ -1187,7 +1139,7 @@ export class BaseClass {
    * @param noNotify {boolean} [options] True if you want to prevent firing the `(key)_changed` event.
    */
   @CordovaInstance({ sync: true })
-  set(key: string, value: any, noNotify?: boolean): void {}
+  set(key: string, value: any, noNotify?: boolean): void { }
 
   /**
    * Bind a key to another object
@@ -1197,12 +1149,7 @@ export class BaseClass {
    * @param noNotify? {boolean} [options] True if you want to prevent `(key)_changed` event when you bind first time, because the internal status is changed from `undefined` to something.
    */
   @CordovaInstance({ sync: true })
-  bindTo(
-    key: string,
-    target: any,
-    targetKey?: string,
-    noNotify?: boolean
-  ): void {}
+  bindTo(key: string, target: any, targetKey?: string, noNotify?: boolean): void { }
 
   /**
    * Alias of `addEventListener`
@@ -1211,7 +1158,7 @@ export class BaseClass {
    */
   @InstanceCheck({ observable: true })
   on(eventName: string): Observable<any> {
-    return new Observable(observer => {
+    return new Observable((observer) => {
       this._objectInstance.on(eventName, (...args: any[]) => {
         if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) {
           if (args[args.length - 1].type === 'Map') {
@@ -1230,9 +1177,7 @@ export class BaseClass {
             }
             args[args.length - 1] = overlay;
           } else {
-            args[args.length - 1] = this._objectInstance
-              .getMap()
-              .get('_overlays')[args[args.length - 1].getId()];
+            args[args.length - 1] = this._objectInstance.getMap().get('_overlays')[args[args.length - 1].getId()];
           }
         }
         observer.next(args);
@@ -1247,7 +1192,7 @@ export class BaseClass {
    */
   @InstanceCheck()
   one(eventName: string): Promise<any> {
-    return new Promise<any>(resolve => {
+    return new Promise<any>((resolve) => {
       this._objectInstance.one(eventName, (...args: any[]) => {
         if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) {
           if (args[args.length - 1].type === 'Map') {
@@ -1266,9 +1211,7 @@ export class BaseClass {
             }
             args[args.length - 1] = overlay;
           } else {
-            args[args.length - 1] = this._objectInstance
-              .getMap()
-              .get('_overlays')[args[args.length - 1].getId()];
+            args[args.length - 1] = this._objectInstance.getMap().get('_overlays')[args[args.length - 1].getId()];
           }
         }
         resolve(args);
@@ -1280,7 +1223,7 @@ export class BaseClass {
    * Clears all stored values
    */
   @CordovaInstance({ sync: true })
-  empty(): void {}
+  empty(): void { }
 
   /**
    * Dispatch event.
@@ -1290,6 +1233,7 @@ export class BaseClass {
   @CordovaInstance({ sync: true })
   trigger(eventName: string, ...parameters: any[]): void {}
 
+
   /**
    * Executes off() and empty()
    */
@@ -1297,9 +1241,7 @@ export class BaseClass {
   destroy(): void {
     let map: GoogleMap = this._objectInstance.getMap();
     if (map) {
-      delete this._objectInstance.getMap().get('_overlays')[
-        this._objectInstance.getId()
-      ];
+      delete this._objectInstance.getMap().get('_overlays')[this._objectInstance.getId()];
     }
     this._objectInstance.remove();
   }
@@ -1318,10 +1260,7 @@ export class BaseClass {
    * @param listener {Function} [options] Event listener
    */
   @CordovaInstance({ sync: true })
-  removeEventListener(
-    eventName?: string,
-    listener?: (...parameters: any[]) => void
-  ): void {}
+  removeEventListener(eventName?: string, listener?: (...parameters: any[]) => void): void {}
 
   /**
    * Alias of `removeEventListener`
@@ -1331,6 +1270,7 @@ export class BaseClass {
    */
   @CordovaInstance({ sync: true })
   off(eventName?: string, listener?: (...parameters: any[]) => void): void {}
+
 }
 
 /**
@@ -1344,14 +1284,13 @@ export class BaseClass {
   repo: ''
 })
 export class BaseArrayClass<T> extends BaseClass {
+
   constructor(initialData?: T[] | any) {
     super();
     if (initialData instanceof GoogleMaps.getPlugin().BaseArrayClass) {
       this._objectInstance = initialData;
     } else {
-      this._objectInstance = new (GoogleMaps.getPlugin()).BaseArrayClass(
-        initialData
-      );
+      this._objectInstance = new (GoogleMaps.getPlugin().BaseArrayClass)(initialData);
     }
   }
 
@@ -1375,10 +1314,8 @@ export class BaseArrayClass<T> extends BaseClass {
    * @return {Promise<any>}
    */
   @CordovaCheck()
-  forEachAsync(
-    fn: ((element: T, callback: () => void) => void)
-  ): Promise<void> {
-    return new Promise<void>(resolve => {
+  forEachAsync(fn: ((element: T, callback: () => void) => void)): Promise<void> {
+    return new Promise<void>((resolve) => {
       this._objectInstance.forEachAsync(fn, resolve);
     });
   }
@@ -1390,9 +1327,7 @@ export class BaseArrayClass<T> extends BaseClass {
    * @return {Array<Object>} returns a new array with the results
    */
   @CordovaInstance({ sync: true })
-  map(fn: (element: T, index: number) => any): any[] {
-    return;
-  }
+  map(fn: (element: T, index: number) => any): any[] { return; }
 
   /**
    * Iterate over each element, calling the provided callback.
@@ -1402,10 +1337,8 @@ export class BaseArrayClass<T> extends BaseClass {
    * @return {Promise<any>} returns a new array with the results
    */
   @CordovaCheck()
-  mapAsync(
-    fn: ((element: T, callback: (newElement: any) => void) => void)
-  ): Promise<any[]> {
-    return new Promise<any[]>(resolve => {
+  mapAsync(fn: ((element: T, callback: (newElement: any) => void) => void)): Promise<any[]> {
+    return new Promise<any[]>((resolve) => {
       this._objectInstance.mapAsync(fn, resolve);
     });
   }
@@ -1417,10 +1350,8 @@ export class BaseArrayClass<T> extends BaseClass {
    * @return {Promise<any>} returns a new array with the results
    */
   @CordovaCheck()
-  mapSeries(
-    fn: ((element: T, callback: (newElement: any) => void) => void)
-  ): Promise<any[]> {
-    return new Promise<any[]>(resolve => {
+  mapSeries(fn: ((element: T, callback: (newElement: any) => void) => void)): Promise<any[]> {
+    return new Promise<any[]>((resolve) => {
       this._objectInstance.mapSeries(fn, resolve);
     });
   }
@@ -1431,9 +1362,7 @@ export class BaseArrayClass<T> extends BaseClass {
    * @return {Array<Object>} returns a new filtered array
    */
   @CordovaInstance({ sync: true })
-  filter(fn: (element: T, index: number) => boolean): T[] {
-    return;
-  }
+  filter(fn: (element: T, index: number) => boolean): T[] { return; }
 
   /**
    * The filterAsync() method creates a new array with all elements that pass the test implemented by the provided function.
@@ -1442,10 +1371,8 @@ export class BaseArrayClass<T> extends BaseClass {
    * @return {Promise<any>} returns a new filtered array
    */
   @CordovaCheck()
-  filterAsync(
-    fn: (element: T, callback: (result: boolean) => void) => void
-  ): Promise<T[]> {
-    return new Promise<any[]>(resolve => {
+  filterAsync(fn: (element: T, callback: (result: boolean) => void) => void): Promise<T[]> {
+    return new Promise<any[]>((resolve) => {
       this._objectInstance.filterAsync(fn, resolve);
     });
   }
@@ -1455,9 +1382,7 @@ export class BaseArrayClass<T> extends BaseClass {
    * @return {Array<Object>}
    */
   @CordovaInstance({ sync: true })
-  getArray(): T[] {
-    return;
-  }
+  getArray(): T[] { return; }
 
   /**
    * Returns the element at the specified index.
@@ -1472,9 +1397,7 @@ export class BaseArrayClass<T> extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getLength(): number {
-    return;
-  }
+  getLength(): number { return; }
 
   /**
    * The indexOf() method returns the first index at which a given element can be found in the array, or -1 if it is not present.
@@ -1482,9 +1405,7 @@ export class BaseArrayClass<T> extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  indexOf(element: T): number {
-    return;
-  }
+  indexOf(element: T): number { return; }
 
   /**
    * The reverse() method reverses an array in place.
@@ -1514,9 +1435,7 @@ export class BaseArrayClass<T> extends BaseClass {
    * @return {Object}
    */
   @CordovaInstance({ sync: true })
-  pop(noNotify?: boolean): T {
-    return;
-  }
+  pop(noNotify?: boolean): T { return; }
 
   /**
    * Adds one element to the end of the array and returns the new length of the array.
@@ -1549,6 +1468,7 @@ export class BaseArrayClass<T> extends BaseClass {
  * https://github.com/mapsplugin/cordova-plugin-googlemaps-doc/blob/master/v2.0.0/class/Circle/README.md
  */
 export class Circle extends BaseClass {
+
   private _map: GoogleMap;
 
   constructor(_map: GoogleMap, _objectInstance: any) {
@@ -1562,17 +1482,13 @@ export class Circle extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getId(): string {
-    return;
-  }
+  getId(): string { return; }
 
   /**
    * Return the map instance.
    * @return {GoogleMap}
    */
-  getMap(): GoogleMap {
-    return this._map;
-  }
+  getMap(): GoogleMap { return this._map; }
 
   /**
    * Change the center position.
@@ -1586,18 +1502,14 @@ export class Circle extends BaseClass {
    * @return {ILatLng}
    */
   @CordovaInstance({ sync: true })
-  getCenter(): ILatLng {
-    return;
-  }
+  getCenter(): ILatLng { return; }
 
   /**
    * Return the current circle radius.
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getRadius(): number {
-    return;
-  }
+  getRadius(): number { return; }
 
   /**
    * Change the circle radius.
@@ -1618,9 +1530,7 @@ export class Circle extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getFillColor(): string {
-    return;
-  }
+  getFillColor(): string { return; }
 
   /**
    * Change the stroke width.
@@ -1634,9 +1544,7 @@ export class Circle extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getStrokeWidth(): number {
-    return;
-  }
+  getStrokeWidth(): number { return; }
 
   /**
    * Change the stroke color (outter color).
@@ -1650,9 +1558,7 @@ export class Circle extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getStrokeColor(): string {
-    return;
-  }
+  getStrokeColor(): string { return; }
 
   /**
    * Change clickablity of the circle.
@@ -1666,9 +1572,7 @@ export class Circle extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getClickable(): boolean {
-    return;
-  }
+  getClickable(): boolean { return; }
 
   /**
    * Change the circle zIndex order.
@@ -1682,9 +1586,7 @@ export class Circle extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getZIndex(): number {
-    return;
-  }
+  getZIndex(): number { return; }
 
   /**
    * Remove the circle.
@@ -1697,9 +1599,7 @@ export class Circle extends BaseClass {
    * @return {LatLngBounds}
    */
   @CordovaInstance({ sync: true })
-  getBounds(): LatLngBounds {
-    return;
-  }
+  getBounds(): LatLngBounds { return; }
 
   /**
    * Set circle visibility
@@ -1713,9 +1613,7 @@ export class Circle extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getVisible(): boolean {
-    return;
-  }
+  getVisible(): boolean { return; }
 }
 
 /**
@@ -1728,15 +1626,14 @@ export class Circle extends BaseClass {
   repo: ''
 })
 export class Environment {
+
   /**
    * Get the open source software license information for Google Maps SDK for iOS.
    * @return {Promise<any>}
    */
   static getLicenseInfo(): Promise<any> {
-    return new Promise<any>(resolve => {
-      GoogleMaps.getPlugin().environment.getLicenseInfo((text: string) =>
-        resolve(text)
-      );
+    return new Promise<any>((resolve) => {
+      GoogleMaps.getPlugin().environment.getLicenseInfo((text: string) => resolve(text));
     });
   }
 
@@ -1745,10 +1642,7 @@ export class Environment {
    * @hidden
    */
   getLicenseInfo(): Promise<any> {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Environment.getLicenseInfo()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Environment.getLicenseInfo()');
     return Environment.getLicenseInfo();
   }
 
@@ -1765,10 +1659,7 @@ export class Environment {
    * @hidden
    */
   setBackgroundColor(color: string): void {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Environment.setBackgroundColor()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Environment.setBackgroundColor()');
     Environment.setBackgroundColor(color);
   }
 }
@@ -1783,17 +1674,13 @@ export class Environment {
   repo: ''
 })
 export class Geocoder {
+
   /**
    * @deprecation
    * @hidden
    */
-  geocode(
-    request: GeocoderRequest
-  ): Promise<GeocoderResult[] | BaseArrayClass<GeocoderResult>> {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Geocoder.geocode()'
-    );
+  geocode(request: GeocoderRequest): Promise<GeocoderResult[] | BaseArrayClass<GeocoderResult>> {
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Geocoder.geocode()');
     return Geocoder.geocode(request);
   }
 
@@ -1802,15 +1689,10 @@ export class Geocoder {
    * @param {GeocoderRequest} request Request object with either an address or a position
    * @return {Promise<GeocoderResult[] | BaseArrayClass<GeocoderResult>>}
    */
-  static geocode(
-    request: GeocoderRequest
-  ): Promise<GeocoderResult[] | BaseArrayClass<GeocoderResult>> {
-    if (
-      request.address instanceof Array ||
-      Array.isArray(request.address) ||
-      request.position instanceof Array ||
-      Array.isArray(request.position)
-    ) {
+  static geocode(request: GeocoderRequest): Promise<GeocoderResult[] | BaseArrayClass<GeocoderResult>> {
+
+    if (request.address instanceof Array || Array.isArray(request.address) ||
+      request.position instanceof Array || Array.isArray(request.position)) {
       // -------------------------
       // Geocoder.geocode({
       //   address: [
@@ -1835,16 +1717,13 @@ export class Geocoder {
       // })
       // -------------------------
       return new Promise<GeocoderResult[]>((resolve, reject) => {
-        GoogleMaps.getPlugin().Geocoder.geocode(
-          request,
-          (results: GeocoderResult[]) => {
-            if (results) {
-              resolve(results);
-            } else {
-              reject();
-            }
+        GoogleMaps.getPlugin().Geocoder.geocode(request, (results: GeocoderResult[]) => {
+          if (results) {
+            resolve(results);
+          } else {
+            reject();
           }
-        );
+        });
       });
     }
   }
@@ -1860,6 +1739,7 @@ export class Geocoder {
   repo: ''
 })
 export class LocationService {
+
   /**
    * Get the current device location without map
    * @return {Promise<MyLocation>}
@@ -1881,15 +1761,13 @@ export class LocationService {
   repo: ''
 })
 export class Encoding {
+
   /**
    * @deprecation
    * @hidden
    */
   decodePath(encoded: string, precision?: number): Array<ILatLng> {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Encoding.decodePath()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Encoding.decodePath()');
     return Encoding.decodePath(encoded, precision);
   }
 
@@ -1898,10 +1776,7 @@ export class Encoding {
    * @hidden
    */
   encodePath(path: Array<ILatLng> | BaseArrayClass<ILatLng>): string {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Encoding.encodePath()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Encoding.encodePath()');
     return Encoding.encodePath(path);
   }
 
@@ -1912,10 +1787,7 @@ export class Encoding {
    * @return {ILatLng[]}
    */
   static decodePath(encoded: string, precision?: number): Array<ILatLng> {
-    return GoogleMaps.getPlugin().geometry.encoding.decodePath(
-      encoded,
-      precision
-    );
+    return GoogleMaps.getPlugin().geometry.encoding.decodePath(encoded, precision);
   }
 
   /**
@@ -1938,6 +1810,7 @@ export class Encoding {
   repo: ''
 })
 export class Poly {
+
   /**
    * Returns true if the speicified location is in the polygon path
    * @param location {ILatLng}
@@ -1945,10 +1818,7 @@ export class Poly {
    * @return {boolean}
    */
   static containsLocation(location: ILatLng, path: ILatLng[]): boolean {
-    return GoogleMaps.getPlugin().geometry.poly.containsLocation(
-      location,
-      path
-    );
+    return GoogleMaps.getPlugin().geometry.poly.containsLocation(location, path);
   }
 
   /**
@@ -1958,10 +1828,7 @@ export class Poly {
    * @return {boolean}
    */
   static isLocationOnEdge(location: ILatLng, path: ILatLng[]): boolean {
-    return GoogleMaps.getPlugin().geometry.poly.isLocationOnEdge(
-      location,
-      path
-    );
+    return GoogleMaps.getPlugin().geometry.poly.isLocationOnEdge(location, path);
   }
 }
 
@@ -1975,15 +1842,13 @@ export class Poly {
   repo: ''
 })
 export class Spherical {
+
   /**
    * @deprecation
    * @hidden
    */
   computeDistanceBetween(from: ILatLng, to: ILatLng): number {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Spherical.computeDistanceBetween()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Spherical.computeDistanceBetween()');
     return Spherical.computeDistanceBetween(from, to);
   }
 
@@ -1992,10 +1857,7 @@ export class Spherical {
    * @hidden
    */
   computeOffset(from: ILatLng, distance: number, heading: number): LatLng {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Spherical.computeOffset()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Spherical.computeOffset()');
     return Spherical.computeOffset(from, distance, heading);
   }
 
@@ -2004,10 +1866,7 @@ export class Spherical {
    * @hidden
    */
   computeOffsetOrigin(to: ILatLng, distance: number, heading: number): LatLng {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Spherical.computeOffsetOrigin()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Spherical.computeOffsetOrigin()');
     return Spherical.computeOffsetOrigin(to, distance, heading);
   }
 
@@ -2016,10 +1875,7 @@ export class Spherical {
    * @hidden
    */
   computeLength(path: Array<ILatLng> | BaseArrayClass<ILatLng>): number {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Spherical.computeLength()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Spherical.computeLength()');
     return Spherical.computeLength(path);
   }
 
@@ -2028,10 +1884,7 @@ export class Spherical {
    * @hidden
    */
   computeArea(path: Array<ILatLng> | BaseArrayClass<ILatLng>): number {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Spherical.computeArea()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Spherical.computeArea()');
     return Spherical.computeArea(path);
   }
 
@@ -2040,10 +1893,7 @@ export class Spherical {
    * @hidden
    */
   computeSignedArea(path: Array<ILatLng> | BaseArrayClass<ILatLng>): number {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Spherical.computeSignedArea()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Spherical.computeSignedArea()');
     return Spherical.computeSignedArea(path);
   }
 
@@ -2052,10 +1902,7 @@ export class Spherical {
    * @hidden
    */
   computeHeading(from: ILatLng, to: ILatLng): number {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Spherical.computeHeading()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Spherical.computeHeading()');
     return Spherical.computeHeading(from, to);
   }
 
@@ -2064,13 +1911,16 @@ export class Spherical {
    * @hidden
    */
   interpolate(from: ILatLng, to: ILatLng, fraction: number): LatLng {
-    console.error(
-      'GoogleMaps',
-      '[deprecated] This method is static. Please use Spherical.interpolate()'
-    );
+    console.error('GoogleMaps', '[deprecated] This method is static. Please use Spherical.interpolate()');
     return Spherical.interpolate(from, to, fraction);
   }
 
+
+
+
+
+
+
   /**
    * Returns the distance, in meters, between two LatLngs.
    * @param locationA {ILatLng}
@@ -2078,10 +1928,7 @@ export class Spherical {
    * @return {number}
    */
   static computeDistanceBetween(from: ILatLng, to: ILatLng): number {
-    return GoogleMaps.getPlugin().geometry.spherical.computeDistanceBetween(
-      from,
-      to
-    );
+    return GoogleMaps.getPlugin().geometry.spherical.computeDistanceBetween(from, to);
   }
 
   /**
@@ -2091,16 +1938,8 @@ export class Spherical {
    * @param heading {number}
    * @return {LatLng}
    */
-  static computeOffset(
-    from: ILatLng,
-    distance: number,
-    heading: number
-  ): LatLng {
-    return GoogleMaps.getPlugin().geometry.spherical.computeOffset(
-      from,
-      distance,
-      heading
-    );
+  static computeOffset(from: ILatLng, distance: number, heading: number): LatLng {
+    return GoogleMaps.getPlugin().geometry.spherical.computeOffset(from, distance, heading);
   }
 
   /**
@@ -2110,16 +1949,8 @@ export class Spherical {
    * @param heading {number} The heading in degrees clockwise from north.
    * @return {LatLng}
    */
-  static computeOffsetOrigin(
-    to: ILatLng,
-    distance: number,
-    heading: number
-  ): LatLng {
-    return GoogleMaps.getPlugin().geometry.spherical.computeOffsetOrigin(
-      to,
-      distance,
-      heading
-    );
+  static computeOffsetOrigin(to: ILatLng, distance: number, heading: number): LatLng {
+    return GoogleMaps.getPlugin().geometry.spherical.computeOffsetOrigin(to, distance, heading);
   }
 
   /**
@@ -2145,9 +1976,7 @@ export class Spherical {
    * @param path {Array<ILatLng> | BaseArrayClass<ILatLng>}.
    * @return {number}
    */
-  static computeSignedArea(
-    path: Array<ILatLng> | BaseArrayClass<ILatLng>
-  ): number {
+  static computeSignedArea(path: Array<ILatLng> | BaseArrayClass<ILatLng>): number {
     return GoogleMaps.getPlugin().geometry.spherical.computeSignedArea(path);
   }
 
@@ -2169,11 +1998,7 @@ export class Spherical {
    * @return {LatLng}
    */
   static interpolate(from: ILatLng, to: ILatLng, fraction: number): LatLng {
-    return GoogleMaps.getPlugin().geometry.spherical.interpolate(
-      from,
-      to,
-      fraction
-    );
+    return GoogleMaps.getPlugin().geometry.spherical.interpolate(from, to, fraction);
   }
 }
 
@@ -2187,30 +2012,17 @@ export class Spherical {
 export class GoogleMap extends BaseClass {
   constructor(element: string | HTMLElement, options?: GoogleMapOptions) {
     super();
-    if (
-      checkAvailability(
-        GoogleMaps.getPluginRef(),
-        null,
-        GoogleMaps.getPluginName()
-      ) === true
-    ) {
+    if (checkAvailability(GoogleMaps.getPluginRef(), null, GoogleMaps.getPluginName()) === true) {
       if (element instanceof HTMLElement) {
-        this._objectInstance = GoogleMaps.getPlugin().Map.getMap(
-          element,
-          options
-        );
+        this._objectInstance = GoogleMaps.getPlugin().Map.getMap(element, options);
       } else if (typeof element === 'string') {
-        let dummyObj: any = new (GoogleMaps.getPlugin()).BaseClass();
+        let dummyObj: any = new (GoogleMaps.getPlugin().BaseClass)();
         this._objectInstance = dummyObj;
         let onListeners: any[] = [];
         let oneListeners: any[] = [];
         let _origAddEventListener: any = this._objectInstance.addEventListener;
-        let _origAddEventListenerOnce: any = this._objectInstance
-          .addEventListenerOnce;
-        this._objectInstance.addEventListener = (
-          eventName: string,
-          fn: () => void
-        ) => {
+        let _origAddEventListenerOnce: any = this._objectInstance.addEventListenerOnce;
+        this._objectInstance.addEventListener = (eventName: string, fn: () => void) => {
           if (eventName === GoogleMapsEvent.MAP_READY) {
             _origAddEventListener.call(dummyObj, eventName, fn);
           } else {
@@ -2219,10 +2031,7 @@ export class GoogleMap extends BaseClass {
         };
         this._objectInstance.on = this._objectInstance.addEventListener;
 
-        this._objectInstance.addEventListenerOnce = (
-          eventName: string,
-          fn: () => void
-        ) => {
+        this._objectInstance.addEventListenerOnce = (eventName: string, fn: () => void) => {
           if (eventName === GoogleMapsEvent.MAP_READY) {
             _origAddEventListenerOnce.call(dummyObj, eventName, fn);
           } else {
@@ -2230,7 +2039,7 @@ export class GoogleMap extends BaseClass {
           }
         };
         this._objectInstance.one = this._objectInstance.addEventListenerOnce;
-        new Promise<any>((resolve, reject) => {
+        (new Promise<any>((resolve, reject) => {
           let count: number = 0;
           let timer: any = setInterval(() => {
             let target = document.querySelector('.show-page #' + element);
@@ -2247,26 +2056,23 @@ export class GoogleMap extends BaseClass {
               reject();
             }
           }, 100);
-        })
-          .then((target: any) => {
-            this._objectInstance = GoogleMaps.getPlugin().Map.getMap(
-              target,
-              options
-            );
-            this._objectInstance.one(GoogleMapsEvent.MAP_READY, () => {
-              this.set('_overlays', {});
-              onListeners.forEach(args => {
-                this.on.apply(this, args);
-              });
-              oneListeners.forEach(args => {
-                this.one.apply(this, args);
-              });
-              dummyObj.trigger(GoogleMapsEvent.MAP_READY);
+        }))
+        .then((target: any) => {
+          this._objectInstance = GoogleMaps.getPlugin().Map.getMap(target, options);
+          this._objectInstance.one(GoogleMapsEvent.MAP_READY, () => {
+            this.set('_overlays', {});
+            onListeners.forEach((args) => {
+              this.on.apply(this, args);
             });
-          })
-          .catch(() => {
-            this._objectInstance = null;
+            oneListeners.forEach((args) => {
+              this.one.apply(this, args);
+            });
+            dummyObj.trigger(GoogleMapsEvent.MAP_READY);
           });
+        })
+        .catch(() => {
+          this._objectInstance = null;
+        });
       } else if (element === null && options) {
         this._objectInstance = GoogleMaps.getPlugin().Map.getMap(null, options);
       }
@@ -2280,9 +2086,7 @@ export class GoogleMap extends BaseClass {
   @InstanceCheck()
   setDiv(domNode?: HTMLElement | string): void {
     if (typeof domNode === 'string') {
-      this._objectInstance.setDiv(
-        document.querySelector('.show-page #' + domNode)
-      );
+      this._objectInstance.setDiv(document.querySelector('.show-page #' + domNode));
     } else {
       this._objectInstance.setDiv(domNode);
     }
@@ -2293,122 +2097,98 @@ export class GoogleMap extends BaseClass {
    * @return {HTMLElement}
    */
   @CordovaInstance({ sync: true })
-  getDiv(): HTMLElement {
-    return;
-  }
+  getDiv(): HTMLElement { return; }
 
   /**
    * Changes the map type id
    * @param mapTypeId {string}
    */
   @CordovaInstance({ sync: true })
-  setMapTypeId(mapTypeId: MapType): void {}
+  setMapTypeId(mapTypeId: MapType): void { }
 
   /**
    * Moves the camera with animation
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  animateCamera(cameraPosition: CameraPosition<any>): Promise<any> {
-    return;
-  }
+  animateCamera(cameraPosition: CameraPosition<any>): Promise<any> { return; }
 
   /**
    * Zooming in the camera with animation
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  animateCameraZoomIn(): Promise<any> {
-    return;
-  }
+  animateCameraZoomIn(): Promise<any> { return; }
 
   /**
    * Zooming out the camera with animation
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  animateCameraZoomOut(): Promise<any> {
-    return;
-  }
+  animateCameraZoomOut(): Promise<any> { return; }
 
   /**
    * Moves the camera without animation
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  moveCamera(cameraPosition: CameraPosition<any>): Promise<any> {
-    return;
-  }
+  moveCamera(cameraPosition: CameraPosition<any>): Promise<any> { return; }
 
   /**
    * Zooming in the camera without animation
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  moveCameraZoomIn(): Promise<any> {
-    return;
-  }
+  moveCameraZoomIn(): Promise<any> { return; }
 
   /**
    * Zooming out the camera without animation
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  moveCameraZoomOut(): Promise<any> {
-    return;
-  }
+  moveCameraZoomOut(): Promise<any> { return; }
 
   /**
    * Get the position of the camera.
    * @return {CameraPosition}
    */
   @CordovaInstance({ sync: true })
-  getCameraPosition(): CameraPosition<ILatLng> {
-    return;
-  }
+  getCameraPosition(): CameraPosition<ILatLng> { return; }
 
   /**
    * Get the current camera target position
    * @return {Promise<CameraPosition>}
    */
   @CordovaInstance({ sync: true })
-  getCameraTarget(): ILatLng {
-    return;
-  }
+  getCameraTarget(): ILatLng { return; }
 
   /**
    * Get the current camera zoom level
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getCameraZoom(): number {
-    return;
-  }
+  getCameraZoom(): number { return; }
 
   /**
    * Get the current camera bearing
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getCameraBearing(): number {
-    return;
-  }
+  getCameraBearing(): number { return; }
 
   /**
    * Get the current camera tilt (view angle)
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getCameraTilt(): number {
-    return;
-  }
+  getCameraTilt(): number { return; }
 
   /**
    * Set the center position of the camera view
    * @param latLng {ILatLng | Array<ILatLng>}
    */
   @CordovaInstance({ sync: true })
-  setCameraTarget(latLng: ILatLng | Array<ILatLng>): void {}
+  setCameraTarget(latLng: ILatLng | Array<ILatLng>): void { }
 
   /**
    * Set zoom level of the camera
@@ -2437,25 +2217,21 @@ export class GoogleMap extends BaseClass {
    * @param y {any}
    */
   @CordovaInstance({ sync: true })
-  panBy(x: string | number, y: string | number): void {}
+  panBy(x: string | number, y: string | number): void { }
 
   /**
    * Get the current visible region (southWest and northEast)
    * @return {VisibleRegion}
    */
   @CordovaInstance({ sync: true })
-  getVisibleRegion(): VisibleRegion {
-    return;
-  }
+  getVisibleRegion(): VisibleRegion { return; }
 
   /**
    * Get the current device location
    * @return {Promise<MyLocation>}
    */
   @CordovaInstance()
-  getMyLocation(options?: MyLocationOptions): Promise<MyLocation> {
-    return;
-  }
+  getMyLocation(options?: MyLocationOptions): Promise<MyLocation> { return; }
 
   /**
    * Set false to ignore all clicks on the map
@@ -2476,7 +2252,7 @@ export class GoogleMap extends BaseClass {
         delete this.get('_overlays')[overlayId];
       });
     }
-    return new Promise<any>(resolve => {
+    return new Promise<any>((resolve) => {
       this._objectInstance.remove(() => resolve());
     });
   }
@@ -2493,7 +2269,7 @@ export class GoogleMap extends BaseClass {
         delete this.get('_overlays')[overlayId];
       });
     }
-    return new Promise<any>(resolve => {
+    return new Promise<any>((resolve) => {
       this._objectInstance.clear(() => resolve());
     });
   }
@@ -2503,18 +2279,14 @@ export class GoogleMap extends BaseClass {
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  fromLatLngToPoint(latLng: ILatLng): Promise<any[]> {
-    return;
-  }
+  fromLatLngToPoint(latLng: ILatLng): Promise<any[]> { return; }
 
   /**
    * Convert the unit from the pixels from the left/top to the LatLng
    * @return {Promise<LatLng>}
    */
   @CordovaInstance()
-  fromPointToLatLng(point: any): Promise<LatLng> {
-    return;
-  }
+  fromPointToLatLng(point: any): Promise<LatLng> { return; }
 
   /**
    * Set true if you want to show the MyLocation control (blue dot)
@@ -2535,9 +2307,7 @@ export class GoogleMap extends BaseClass {
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  getFocusedBuilding(): Promise<any> {
-    return;
-  }
+  getFocusedBuilding(): Promise<any> { return; }
 
   /**
    * Set true if you want to show the indoor map
@@ -2582,12 +2352,7 @@ export class GoogleMap extends BaseClass {
    * @param bottom {number}
    */
   @CordovaInstance({ sync: true })
-  setPadding(
-    top?: number,
-    right?: number,
-    bottom?: number,
-    left?: number
-  ): void {}
+  setPadding(top?: number, right?: number, bottom?: number, left?: number): void { }
 
   /**
    * Set options
@@ -2629,9 +2394,7 @@ export class GoogleMap extends BaseClass {
    * @return {Promise<MarkerCluster | any>}
    */
   @InstanceCheck()
-  addMarkerCluster(
-    options: MarkerClusterOptions
-  ): Promise<MarkerCluster | any> {
+  addMarkerCluster(options: MarkerClusterOptions): Promise<MarkerCluster | any> {
     return new Promise<MarkerCluster>((resolve, reject) => {
       this._objectInstance.addMarkerCluster(options, (markerCluster: any) => {
         if (markerCluster) {
@@ -2767,9 +2530,7 @@ export class GoogleMap extends BaseClass {
    * @return {Promise<GroundOverlay | any>}
    */
   @InstanceCheck()
-  addGroundOverlay(
-    options: GroundOverlayOptions
-  ): Promise<GroundOverlay | any> {
+  addGroundOverlay(options: GroundOverlayOptions): Promise<GroundOverlay | any> {
     return new Promise<GroundOverlay>((resolve, reject) => {
       this._objectInstance.addGroundOverlay(options, (groundOverlay: any) => {
         if (groundOverlay) {
@@ -2823,15 +2584,15 @@ export class GoogleMap extends BaseClass {
    * @return {Promise<string>}
    */
   @CordovaInstance()
-  toDataURL(params?: ToDataUrlOptions): Promise<string> {
-    return;
-  }
+  toDataURL(params?: ToDataUrlOptions): Promise<string> { return; }
+
 }
 
 /**
  * @hidden
  */
 export class GroundOverlay extends BaseClass {
+
   private _map: GoogleMap;
 
   constructor(_map: GoogleMap, _objectInstance: any) {
@@ -2845,17 +2606,13 @@ export class GroundOverlay extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getId(): string {
-    return;
-  }
+  getId(): string { return; }
 
   /**
    * Return the map instance.
    * @return {GoogleMap}
    */
-  getMap(): GoogleMap {
-    return this._map;
-  }
+  getMap(): GoogleMap { return this._map; }
 
   /**
    * Change the bounds of the GroundOverlay
@@ -2869,38 +2626,34 @@ export class GroundOverlay extends BaseClass {
    * @param bearing {number}
    */
   @CordovaInstance({ sync: true })
-  setBearing(bearing: number): void {}
+  setBearing(bearing: number): void { }
 
   /**
    * Return the current bearing value
    */
   @CordovaInstance({ sync: true })
-  getBearing(): number {
-    return;
-  }
+  getBearing(): number { return; }
 
   /**
    * Change the image of the ground overlay
    * @param image {string} URL of image
    */
   @CordovaInstance({ sync: true })
-  setImage(image: string): void {}
+  setImage(image: string): void {};
 
   /**
    * Change the opacity of the ground overlay from 0.0 to 1.0
    * @param opacity {number}
    */
   @CordovaInstance({ sync: true })
-  setOpacity(opacity: number): void {}
+  setOpacity(opacity: number): void { }
 
   /**
    * Return the current opacity
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getOpacity(): number {
-    return;
-  }
+  getOpacity(): number { return; }
 
   /**
    * Change clickablity of the ground overlay
@@ -2914,25 +2667,21 @@ export class GroundOverlay extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getClickable(): boolean {
-    return;
-  }
+  getClickable(): boolean { return; }
 
   /**
    * Change visibility of the ground overlay
    * @param visible {boolean}
    */
   @CordovaInstance({ sync: true })
-  setVisible(visible: boolean): void {}
+  setVisible(visible: boolean): void { }
 
   /**
    * Return true if the ground overlay is visible
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getVisible(): boolean {
-    return;
-  }
+  getVisible(): boolean { return; }
 
   /**
    * Change the ground overlay zIndex order
@@ -2946,9 +2695,7 @@ export class GroundOverlay extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getZIndex(): number {
-    return;
-  }
+  getZIndex(): number { return; }
 
   /**
    * Remove the ground overlay
@@ -2971,9 +2718,10 @@ export class GroundOverlay extends BaseClass {
   repo: ''
 })
 export class HtmlInfoWindow extends BaseClass {
+
   constructor() {
     super();
-    this._objectInstance = new (GoogleMaps.getPlugin()).HtmlInfoWindow();
+    this._objectInstance = new (GoogleMaps.getPlugin().HtmlInfoWindow)();
   }
 
   /**
@@ -3003,12 +2751,14 @@ export class HtmlInfoWindow extends BaseClass {
    */
   @CordovaInstance()
   close(): void {}
+
 }
 
 /**
  * @hidden
  */
 export class Marker extends BaseClass {
+
   private _map: GoogleMap;
 
   constructor(_map: GoogleMap, _objectInstance: any) {
@@ -3022,35 +2772,27 @@ export class Marker extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getId(): string {
-    return;
-  }
+  getId(): string { return; }
 
   /**
    * Return the map instance.
    * @return {GoogleMap}
    */
-  getMap(): GoogleMap {
-    return this._map;
-  }
+  getMap(): GoogleMap { return this._map; }
 
   /**
    * Set the marker position.
    * @param latLng {ILatLng}
    */
   @CordovaInstance({ sync: true })
-  setPosition(latLng: ILatLng): void {
-    return;
-  }
+  setPosition(latLng: ILatLng): void { return; }
 
   /**
    * Return the marker position.
    * @return {ILatLng}
    */
   @CordovaInstance({ sync: true })
-  getPosition(): ILatLng {
-    return;
-  }
+  getPosition(): ILatLng { return; }
 
   /**
    * Show the normal infoWindow of the marker.
@@ -3089,9 +2831,7 @@ export class Marker extends BaseClass {
    * Return true if the marker is visible
    */
   @CordovaInstance({ sync: true })
-  isVisible(): boolean {
-    return;
-  }
+  isVisible(): boolean { return; }
 
   /**
    * Change title of the normal infoWindow.
@@ -3105,9 +2845,7 @@ export class Marker extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getTitle(): string {
-    return;
-  }
+  getTitle(): string { return; }
 
   /**
    * Change snippet of the normal infoWindow.
@@ -3121,9 +2859,7 @@ export class Marker extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getSnippet(): string {
-    return;
-  }
+  getSnippet(): string { return; }
 
   /**
    * Change the marker opacity from 0.0 to 1.0.
@@ -3137,9 +2873,7 @@ export class Marker extends BaseClass {
    * @return {number} Opacity
    */
   @CordovaInstance({ sync: true })
-  getOpacity(): number {
-    return;
-  }
+  getOpacity(): number { return; }
 
   /**
    * Remove the marker.
@@ -3172,18 +2906,14 @@ export class Marker extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  isInfoWindowShown(): boolean {
-    return;
-  }
+  isInfoWindowShown(): boolean { return; }
 
   /**
    * Return the marker hash code.
    * @return {string} Marker hash code
    */
   @CordovaInstance({ sync: true })
-  getHashCode(): string {
-    return;
-  }
+  getHashCode(): string { return; }
 
   /**
    * Higher zIndex value overlays will be drawn on top of lower zIndex value tile layers and overlays.
@@ -3197,65 +2927,57 @@ export class Marker extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getZIndex(): number {
-    return;
-  }
+  getZIndex(): number { return; }
 
   /**
    * Set true if you allow all users to drag the marker.
    * @param draggable {boolean}
    */
   @CordovaInstance({ sync: true })
-  setDraggable(draggable: boolean): void {}
+  setDraggable(draggable: boolean): void { }
 
   /**
    * Return true if the marker drag is enabled.
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  isDraggable(): boolean {
-    return;
-  }
+  isDraggable(): boolean { return; }
 
   /**
    * Set true if you want to be flat marker.
    * @param flat {boolean}
    */
   @CordovaInstance({ sync: true })
-  setFlat(flat: boolean): void {
-    return;
-  }
+  setFlat(flat: boolean): void { return; }
 
   /**
    * Change icon url and/or size
    * @param icon
    */
   @CordovaInstance({ sync: true })
-  setIcon(icon: MarkerIcon): void {
-    return;
-  }
+  setIcon(icon: MarkerIcon): void { return; }
 
   /**
    * Set the marker rotation angle.
    * @param rotation {number}
    */
   @CordovaInstance({ sync: true })
-  setRotation(rotation: number): void {}
+  setRotation(rotation: number): void { }
 
   /**
    * Return the marker rotation angle.
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getRotation(): number {
-    return;
-  }
+  getRotation(): number { return; }
+
 }
 
 /**
  * @hidden
  */
 export class MarkerCluster extends BaseClass {
+
   private _map: GoogleMap;
 
   constructor(_map: GoogleMap, _objectInstance: any) {
@@ -3269,9 +2991,7 @@ export class MarkerCluster extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getId(): string {
-    return;
-  }
+  getId(): string { return; }
 
   /**
    * Add one marker location
@@ -3303,15 +3023,15 @@ export class MarkerCluster extends BaseClass {
    * Return the map instance.
    * @return {GoogleMap}
    */
-  getMap(): GoogleMap {
-    return this._map;
-  }
+  getMap(): GoogleMap { return this._map; }
+
 }
 
 /**
  * @hidden
  */
 export class Polygon extends BaseClass {
+
   private _map: GoogleMap;
 
   constructor(_map: GoogleMap, _objectInstance: any) {
@@ -3325,17 +3045,13 @@ export class Polygon extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getId(): string {
-    return;
-  }
+  getId(): string { return; }
 
   /**
    * Return the map instance.
    * @return {GoogleMap}
    */
-  getMap(): GoogleMap {
-    return this._map;
-  }
+  getMap(): GoogleMap { return this._map; }
 
   /**
    * Change the polygon points.
@@ -3374,7 +3090,7 @@ export class Polygon extends BaseClass {
       results.push(hole);
     });
     return results;
-  }
+ }
 
   /**
    * Change the filling color (inner color)
@@ -3388,9 +3104,7 @@ export class Polygon extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getFillColor(): string {
-    return;
-  }
+  getFillColor(): string { return; }
 
   /**
    * Change the stroke color (outer color)
@@ -3404,9 +3118,7 @@ export class Polygon extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getStrokeColor(): string {
-    return;
-  }
+  getStrokeColor(): string { return; }
 
   /**
    * Change clickablity of the polygon
@@ -3419,9 +3131,7 @@ export class Polygon extends BaseClass {
    * Return true if the polygon is clickable
    */
   @CordovaInstance({ sync: true })
-  getClickable(): boolean {
-    return;
-  }
+  getClickable(): boolean { return; }
 
   /**
    * Change visibility of the polygon
@@ -3435,9 +3145,7 @@ export class Polygon extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getVisible(): boolean {
-    return;
-  }
+  getVisible(): boolean { return; }
 
   /**
    * Change the polygon zIndex order.
@@ -3451,9 +3159,7 @@ export class Polygon extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getZIndex(): number {
-    return;
-  }
+  getZIndex(): number { return; }
 
   /**
    * Remove the polygon.
@@ -3475,9 +3181,7 @@ export class Polygon extends BaseClass {
    * Return the polygon stroke width
    */
   @CordovaInstance({ sync: true })
-  getStrokeWidth(): number {
-    return;
-  }
+  getStrokeWidth(): number { return; }
 
   /**
    * When true, edges of the polygon are interpreted as geodesic and will follow the curvature of the Earth.
@@ -3491,15 +3195,15 @@ export class Polygon extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getGeodesic(): boolean {
-    return;
-  }
+  getGeodesic(): boolean { return; }
+
 }
 
 /**
  * @hidden
  */
 export class Polyline extends BaseClass {
+
   private _map: GoogleMap;
 
   constructor(_map: GoogleMap, _objectInstance: any) {
@@ -3513,17 +3217,13 @@ export class Polyline extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getId(): string {
-    return;
-  }
+  getId(): string { return; }
 
   /**
    * Return the map instance.
    * @return {GoogleMap}
    */
-  getMap(): GoogleMap {
-    return this._map;
-  }
+  getMap(): GoogleMap { return this._map; }
 
   /**
    * Change the polyline points.
@@ -3553,9 +3253,7 @@ export class Polyline extends BaseClass {
    * Return true if the polyline is geodesic
    */
   @CordovaInstance({ sync: true })
-  getGeodesic(): boolean {
-    return;
-  }
+  getGeodesic(): boolean { return; }
 
   /**
    * Change visibility of the polyline
@@ -3569,9 +3267,7 @@ export class Polyline extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getVisible(): boolean {
-    return;
-  }
+  getVisible(): boolean { return; }
 
   /**
    * Change clickablity of the polyline
@@ -3585,9 +3281,7 @@ export class Polyline extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getClickable(): boolean {
-    return;
-  }
+  getClickable(): boolean { return; }
 
   /**
    * Change the polyline color
@@ -3601,9 +3295,7 @@ export class Polyline extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getStrokeColor(): string {
-    return;
-  }
+  getStrokeColor(): string { return; }
 
   /**
    * Change the polyline stroke width
@@ -3617,9 +3309,7 @@ export class Polyline extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getStrokeWidth(): number {
-    return;
-  }
+  getStrokeWidth(): number { return; }
 
   /**
    * Change the polyline zIndex order.
@@ -3633,9 +3323,7 @@ export class Polyline extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getZIndex(): number {
-    return;
-  }
+  getZIndex(): number { return; }
 
   /**
    * Remove the polyline
@@ -3652,6 +3340,7 @@ export class Polyline extends BaseClass {
  * @hidden
  */
 export class TileOverlay extends BaseClass {
+
   private _map: GoogleMap;
 
   constructor(_map: GoogleMap, _objectInstance: any) {
@@ -3665,17 +3354,13 @@ export class TileOverlay extends BaseClass {
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getId(): string {
-    return;
-  }
+  getId(): string { return; }
 
   /**
    * Return the map instance.
    * @return {GoogleMap}
    */
-  getMap(): GoogleMap {
-    return this._map;
-  }
+  getMap(): GoogleMap { return this._map; }
 
   /**
    * Set whether the tiles should fade in.
@@ -3689,9 +3374,7 @@ export class TileOverlay extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getFadeIn(): boolean {
-    return;
-  }
+  getFadeIn(): boolean { return; }
 
   /**
    * Set the zIndex of the tile overlay
@@ -3705,9 +3388,7 @@ export class TileOverlay extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getZIndex(): number {
-    return;
-  }
+  getZIndex(): number { return; }
 
   /**
    * Set the opacity of the tile overlay
@@ -3721,9 +3402,7 @@ export class TileOverlay extends BaseClass {
    * @return {number}
    */
   @CordovaInstance({ sync: true })
-  getOpacity(): number {
-    return;
-  }
+  getOpacity(): number { return; }
 
   /**
    * Set false if you want to hide
@@ -3737,17 +3416,13 @@ export class TileOverlay extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getVisible(): boolean {
-    return;
-  }
+  getVisible(): boolean { return; }
 
   /**
    * Get tile size
    */
   @CordovaInstance({ sync: true })
-  getTileSize(): any {
-    return;
-  }
+  getTileSize(): any { return; }
 
   /**
    * Remove the tile overlay
@@ -3764,6 +3439,7 @@ export class TileOverlay extends BaseClass {
  * @hidden
  */
 export class KmlOverlay extends BaseClass {
+
   private _map: GoogleMap;
 
   constructor(_map: GoogleMap, _objectInstance: any) {
@@ -3772,12 +3448,12 @@ export class KmlOverlay extends BaseClass {
     this._objectInstance = _objectInstance;
 
     Object.defineProperty(self, 'camera', {
-      value: this._objectInstance.camera,
-      writable: false
+        value: this._objectInstance.camera,
+        writable: false
     });
     Object.defineProperty(self, 'kmlData', {
-      value: this._objectInstance.kmlData,
-      writable: false
+        value: this._objectInstance.kmlData,
+        writable: false
     });
   }
 
@@ -3785,26 +3461,20 @@ export class KmlOverlay extends BaseClass {
    * Returns the viewport to contains all overlays
    */
   @CordovaInstance({ sync: true })
-  getDefaultViewport(): CameraPosition<ILatLng | ILatLng[]> {
-    return;
-  }
+  getDefaultViewport(): CameraPosition<ILatLng|ILatLng[]> { return; }
 
   /**
    * Return the ID of instance.
    * @return {string}
    */
   @CordovaInstance({ sync: true })
-  getId(): string {
-    return;
-  }
+  getId(): string { return; }
 
   /**
    * Return the map instance.
    * @return {GoogleMap}
    */
-  getMap(): GoogleMap {
-    return this._map;
-  }
+  getMap(): GoogleMap { return this._map; }
 
   /**
    * Change visibility of the polyline
@@ -3818,9 +3488,7 @@ export class KmlOverlay extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getVisible(): boolean {
-    return;
-  }
+  getVisible(): boolean { return; }
 
   /**
    * Change clickablity of the KmlOverlay
@@ -3834,9 +3502,7 @@ export class KmlOverlay extends BaseClass {
    * @return {boolean}
    */
   @CordovaInstance({ sync: true })
-  getClickable(): boolean {
-    return;
-  }
+  getClickable(): boolean { return; }
 
   /**
    * Remove the KmlOverlay
diff --git a/src/@ionic-native/plugins/google-play-games-services/index.ts b/src/@ionic-native/plugins/google-play-games-services/index.ts
index b106d39fa..73314ffb9 100644
--- a/src/@ionic-native/plugins/google-play-games-services/index.ts
+++ b/src/@ionic-native/plugins/google-play-games-services/index.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface ScoreData {
+
   /**
    * The score to submit.
    */
@@ -11,37 +12,47 @@ export interface ScoreData {
    * The leaderboard ID from Google Play Developer console.
    */
   leaderboardId: string;
+
 }
 
 export interface LeaderboardData {
+
   /**
    * The leaderboard ID from Goole Play Developer console.
    */
   leaderboardId: string;
+
 }
 
 export interface AchievementData {
+
   /**
    * The achievement ID from Google Play Developer console.
    */
   achievementId: string;
+
 }
 
 export interface IncrementableAchievementData extends AchievementData {
+
   /**
    * The amount to increment the achievement by.
    */
   numSteps: number;
+
 }
 
 export interface SignedInResponse {
+
   /**
    * True or false is the use is signed in.
    */
   isSignedIn: boolean;
+
 }
 
 export interface Player {
+
   /**
    * The players display name.
    */
@@ -56,10 +67,10 @@ export interface Player {
    * The title of the player based on their gameplay activity. Not
    * all players have this and it may change over time.
    */
-  title: string | null;
+  title: string|null;
 
   /**
-   * Retrieves the URI for loading this player's icon-size profile image.
+   * Retrieves the URI for loading this player's icon-size profile image. 
    * Returns null if the player has no profile image.
    */
   iconImageUrl: string;
@@ -69,6 +80,7 @@ export interface Player {
    * null if the player has no profile image.
    */
   hiResIconImageUrl: string;
+
 }
 
 /**
@@ -89,12 +101,12 @@ export interface Player {
  * this.googlePlayGamesServices.auth()
  *     .then(() => console.log('Logged in to Play Games Services'))
  *     .catch(e) => console.log('Error logging in Play Games Services', e);
- *
+ * 
  * // Sign out of Play Games Services.
  * this.googlePlayGamesServices.signOut()
  *     .then(() => console.log('Logged out of Play Games Services'))
  *     .catch(e => console.log('Error logging out of Play Games Services', e);
- *
+ * 
  * // Check auth status.
  * this.googlePlayGamesServices.isSignedIn()
  *     .then((signedIn: SignedInResponse) => {
@@ -102,38 +114,38 @@ export interface Player {
  *             hideLoginButton();
  *         }
  *     });
- *
+ * 
  * // Fetch currently authenticated user's data.
  * this.googlePlayGamesServices.showPlayer().then((data: Player) => {
  *    console.log('Player data', data);
  * });
- *
+ * 
  * // Submit a score.
  * this.googlePlayGamesServices.submitScore({
  *     score: 100,
  *     leaderboardId: 'SomeLeaderboardId'
  * });
- *
+ * 
  * // Show the native leaderboards window.
  * this.googlePlayGamesServices.showAllLeaderboards()
  *     .then(() => console.log('The leaderboard window is visible.'));
- *
+ * 
  * // Show a signle native leaderboard window.
  * this.googlePlayGamesServices.showLeaderboard({
  *     leaderboardId: 'SomeLeaderBoardId'
  * }).then(() => console.log('The leaderboard window is visible.'));
- *
+ * 
  * // Unlock an achievement.
  * this.googlePlayGamesServices.unlockAchievement({
  *     achievementId: 'SomeAchievementId'
  * }).then(() => console.log('Achievement unlocked'));
- *
+ * 
  * // Incremement an achievement.
  * this.googlePlayGamesServices.incrementAchievement({
  *     step: 1,
  *     achievementId: 'SomeAchievementId'
  * }).then(() => console.log('Achievement incremented'));
- *
+ * 
  * // Show the native achievements window.
  * this.googlePlayGamesServices.showAchivements()
  *    .then(() => console.log('The achievements window is visible.'));
@@ -146,126 +158,107 @@ export interface Player {
   pluginRef: 'plugins.playGamesServices',
   repo: 'https://github.com/artberri/cordova-plugin-play-games-services',
   platforms: ['Android'],
-  install:
-    'ionic cordova plugin add cordova-plugin-play-games-service --variable APP_ID="YOUR_APP_ID'
+  install: 'ionic cordova plugin add cordova-plugin-play-games-service --variable APP_ID="YOUR_APP_ID',
 })
 @Injectable()
 export class GooglePlayGamesServices extends IonicNativePlugin {
+
   /**
    * Initialise native Play Games Service login procedure.
-   *
+   * 
    * @return {Promise<any>} Returns a promise that resolves when the player
    * is authenticated with Play Games Services.
    */
   @Cordova()
-  auth(): Promise<any> {
-    return;
-  }
+  auth(): Promise<any> { return; }
 
   /**
    * Sign out of Google Play Games Services.
-   *
+   * 
    * @return {Promise<any>} Returns a promise that resolve when the player
    * successfully signs out.
    */
   @Cordova()
-  signOut(): Promise<any> {
-    return;
-  }
+  signOut(): Promise<any> { return; }
 
   /**
    * Check if the user is signed in.
-   *
+   * 
    * @return {Promise<SignedInResponse>} Returns a promise that resolves with
    * the signed in response.
    */
   @Cordova()
-  isSignedIn(): Promise<SignedInResponse> {
-    return;
-  }
+  isSignedIn(): Promise<SignedInResponse> { return; }
 
   /**
    * Show the currently authenticated player.
-   *
-   * @return {Promise<Player>} Returns a promise that resolves when Play
+   * 
+   * @return {Promise<Player>} Returns a promise that resolves when Play 
    * Games Services returns the authenticated player.
    */
   @Cordova()
-  showPlayer(): Promise<Player> {
-    return;
-  }
+  showPlayer(): Promise<Player> { return; }
 
   /**
    * Submit a score to a leaderboard. You should ensure that you have a
    * successful return from auth() before submitting a score.
-   *
+   * 
    * @param data {ScoreData} The score data you want to submit.
    * @return {Promise<any>} Returns a promise that resolves when the
    * score is submitted.
    */
   @Cordova()
-  submitScore(data: ScoreData): Promise<string> {
-    return;
-  }
+  submitScore(data: ScoreData): Promise<string> { return; }
 
   /**
    * Launches the native Play Games leaderboard view controller to show all the
    * leaderboards.
-   *
+   * 
    * @return {Promise<any>} Returns a promise that resolves when the native
    * leaderboards window opens.
    */
   @Cordova()
-  showAllLeaderboards(): Promise<any> {
-    return;
-  }
+  showAllLeaderboards(): Promise<any> { return; }
 
   /**
    * Launches the native Play Games leaderboard view controll to show the
    * specified leaderboard.
-   *
+   * 
    * @param data {LeaderboardData} The leaderboard you want to show.
    * @return {Promise<any>} Returns a promise that resolves when the native
    * leaderboard window opens.
    */
   @Cordova()
-  showLeaderboard(data: LeaderboardData): Promise<any> {
-    return;
-  }
+  showLeaderboard(data: LeaderboardData): Promise<any> { return; }
 
   /**
    * Unlock an achievement.
-   *
+   * 
    * @param data {AchievementData}
    * @return {Promise<any>} Returns a promise that resolves when the
    * achievement is unlocked.
    */
   @Cordova()
-  unlockAchievement(data: AchievementData): Promise<string> {
-    return;
-  }
+  unlockAchievement(data: AchievementData): Promise<string> { return; }
 
   /**
    * Increment an achievement.
-   *
+   * 
    * @param data {IncrementableAchievementData}
    * @return {Promise<any>} Returns a promise that resolves when the
    * achievement is incremented.
    */
   @Cordova()
-  incrementAchievement(data: IncrementableAchievementData): Promise<string> {
-    return;
-  }
+  incrementAchievement(data: IncrementableAchievementData): Promise<string> { return; }
 
   /**
    * Lauches the native Play Games achievements view controller to show
    * achievements.
-   *
+   * 
    * @return {Promise<any>} Returns a promise that resolves when the
    * achievement window opens.
    */
   @Cordova()
-  showAchievements(): Promise<any> {
-    return;
-  }
+  showAchievements(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/google-plus/index.ts b/src/@ionic-native/plugins/google-plus/index.ts
index 32dbfe426..95a69106e 100644
--- a/src/@ionic-native/plugins/google-plus/index.ts
+++ b/src/@ionic-native/plugins/google-plus/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Google Plus
@@ -23,13 +23,13 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-googleplus',
   pluginRef: 'window.plugins.googleplus',
   repo: 'https://github.com/EddyVerbruggen/cordova-plugin-googleplus',
-  install:
-    'ionic cordova plugin add cordova-plugin-googleplus --variable REVERSED_CLIENT_ID=myreversedclientid',
+  install: 'ionic cordova plugin add cordova-plugin-googleplus --variable REVERSED_CLIENT_ID=myreversedclientid',
   installVariables: ['REVERSED_CLIENT_ID'],
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class GooglePlus extends IonicNativePlugin {
+
   /**
    * The login function walks the user through the Google Auth process.
    * @param options
@@ -39,9 +39,7 @@ export class GooglePlus extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  login(options?: any): Promise<any> {
-    return;
-  }
+  login(options?: any): Promise<any> { return; }
 
   /**
    * You can call trySilentLogin to check if they're already signed in to the app and sign them in silently if they are.
@@ -49,34 +47,27 @@ export class GooglePlus extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  trySilentLogin(options?: any): Promise<any> {
-    return;
-  }
+  trySilentLogin(options?: any): Promise<any> { return; }
 
   /**
    * This will clear the OAuth2 token.
    * @returns {Promise<any>}
    */
   @Cordova()
-  logout(): Promise<any> {
-    return;
-  }
+  logout(): Promise<any> { return; }
 
   /**
    * This will clear the OAuth2 token, forget which account was used to login, and disconnect that account from the app. This will require the user to allow the app access again next time they sign in. Be aware that this effect is not always instantaneous. It can take time to completely disconnect.
    * @returns {Promise<any>}
    */
   @Cordova()
-  disconnect(): Promise<any> {
-    return;
-  }
+  disconnect(): Promise<any> { return; }
 
   /**
    * This will retrieve the Android signing certificate fingerprint which is required in the Google Developer Console.
    * @returns {Promise<any>}
    */
   @Cordova()
-  getSigningCertificateFingerprint(): Promise<any> {
-    return;
-  }
+  getSigningCertificateFingerprint(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/gyroscope/index.ts b/src/@ionic-native/plugins/gyroscope/index.ts
index de903b065..87af80f2a 100644
--- a/src/@ionic-native/plugins/gyroscope/index.ts
+++ b/src/@ionic-native/plugins/gyroscope/index.ts
@@ -1,6 +1,6 @@
-import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
+import { Injectable } from '@angular/core';
 
 declare const navigator: any;
 
@@ -82,20 +82,19 @@ export interface GyroscopeOptions {
 })
 @Injectable()
 export class Gyroscope extends IonicNativePlugin {
+
   /**
    * Watching for gyroscope sensor changes
    * @param {GyroscopeOptions} [options]
    * @return {Observable<GyroscopeOrientation>} Returns an Observable that resolves GyroscopeOrientation
    */
   watch(options?: GyroscopeOptions): Observable<GyroscopeOrientation> {
-    return new Observable<GyroscopeOrientation>((observer: any) => {
-      let watchId = navigator.gyroscope.watch(
-        observer.next.bind(observer),
-        observer.next.bind(observer),
-        options
-      );
-      return () => navigator.gyroscope.clearWatch(watchId);
-    });
+    return new Observable<GyroscopeOrientation>(
+      (observer: any) => {
+        let watchId = navigator.gyroscope.watch(observer.next.bind(observer), observer.next.bind(observer), options);
+        return () => navigator.gyroscope.clearWatch(watchId);
+      }
+    );
   }
 
   /**
@@ -106,7 +105,5 @@ export class Gyroscope extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getCurrent(options?: GyroscopeOptions): Promise<GyroscopeOrientation> {
-    return;
-  }
+  getCurrent(options?: GyroscopeOptions): Promise<GyroscopeOrientation> { return; }
 }
diff --git a/src/@ionic-native/plugins/header-color/index.ts b/src/@ionic-native/plugins/header-color/index.ts
index 40df263c4..edf82e430 100644
--- a/src/@ionic-native/plugins/header-color/index.ts
+++ b/src/@ionic-native/plugins/header-color/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Header Color
@@ -26,6 +26,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class HeaderColor extends IonicNativePlugin {
+
   /**
    * Set a color to the task header
    * @param color {string} The hex value of the color
@@ -36,7 +37,6 @@ export class HeaderColor extends IonicNativePlugin {
     successName: 'success',
     errorName: 'failure'
   })
-  tint(color: string): Promise<any> {
-    return;
-  }
+  tint(color: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/health-kit/index.ts b/src/@ionic-native/plugins/health-kit/index.ts
index 646d1e416..3184729af 100644
--- a/src/@ionic-native/plugins/health-kit/index.ts
+++ b/src/@ionic-native/plugins/health-kit/index.ts
@@ -1,116 +1,116 @@
+import { Plugin, Cordova, IonicNativePlugin  } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface HealthKitOptions {
   /**
-   * HKWorkoutActivityType constant
-   * Read more here: https://developer.apple.com/library/ios/documentation/HealthKit/Reference/HKWorkout_Class/#//apple_ref/c/tdef/HKWorkoutActivityType
-   */
+  * HKWorkoutActivityType constant
+  * Read more here: https://developer.apple.com/library/ios/documentation/HealthKit/Reference/HKWorkout_Class/#//apple_ref/c/tdef/HKWorkoutActivityType
+  */
   activityType?: string; //
 
   /**
-   * 'hour', 'week', 'year' or 'day', default 'day'
-   */
+  * 'hour', 'week', 'year' or 'day', default 'day'
+  */
   aggregation?: string;
 
   /**
-   *
-   */
+  *
+  */
   amount?: number;
 
   /**
-   *
-   */
+  *
+  */
   correlationType?: string;
 
   /**
-   *
-   */
+  *
+  */
   date?: any;
 
   /**
-   *
-   */
+  *
+  */
   distance?: number;
 
   /**
-   * probably useful with the former param
-   */
+  * probably useful with the former param
+  */
   distanceUnit?: string;
 
   /**
-   * in seconds, optional, use either this or endDate
-   */
+  * in seconds, optional, use either this or endDate
+  */
   duration?: number;
 
   /**
-   *
-   */
+  *
+  */
   endDate?: any;
 
   /**
-   *
-   */
+  *
+  */
   energy?: number;
 
   /**
-   * J|cal|kcal
-   */
+  * J|cal|kcal
+  */
   energyUnit?: string;
 
   /**
-   *
-   */
+  *
+  */
   extraData?: any;
 
   /**
-   *
-   */
+  *
+  */
   metadata?: any;
 
   /**
-   *
-   */
+  *
+  */
   quantityType?: string;
 
   /**
-   *
-   */
+  *
+  */
   readTypes?: any;
 
   /**
-   *
-   */
+  *
+  */
   requestWritePermission?: boolean;
 
   /**
-   *
-   */
+  *
+  */
   samples?: any;
 
   /**
-   *
-   */
+  *
+  */
   sampleType?: string;
 
   /**
-   *
-   */
+  *
+  */
   startDate?: any;
 
   /**
-   * m|cm|mm|in|ft
-   */
+  * m|cm|mm|in|ft
+  */
   unit?: string;
 
   /**
-   *
-   */
+  *
+  */
   requestReadPermission?: boolean;
 
   /**
-   *
-   */
+  *
+  */
   writeTypes?: any;
 }
 
@@ -142,207 +142,168 @@ export interface HealthKitOptions {
 })
 @Injectable()
 export class HealthKit extends IonicNativePlugin {
-  /**
-   * Check if HealthKit is supported (iOS8+, not on iPad)
-   * @returns {Promise<any>}
-   */
-  @Cordova()
-  available(): Promise<any> {
-    return;
-  }
 
   /**
-   * Pass in a type and get back on of undetermined | denied | authorized
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ * Check if HealthKit is supported (iOS8+, not on iPad)
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  checkAuthStatus(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  available(): Promise<any> { return; }
 
   /**
-   * Ask some or all permissions up front
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ * Pass in a type and get back on of undetermined | denied | authorized
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  requestAuthorization(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  checkAuthStatus(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   * Formatted as yyyy-MM-dd
-   * @returns {Promise<any>}
-   */
+ * Ask some or all permissions up front
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  readDateOfBirth(): Promise<any> {
-    return;
-  }
+  requestAuthorization(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   * Output = male|female|other|unknown
-   * @returns {Promise<any>}
-   */
+ * Formatted as yyyy-MM-dd
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  readGender(): Promise<any> {
-    return;
-  }
+  readDateOfBirth(): Promise<any> { return; }
 
   /**
-   * Output = A+|A-|B+|B-|AB+|AB-|O+|O-|unknown
-   * @returns {Promise<any>}
-   */
+ * Output = male|female|other|unknown
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  readBloodType(): Promise<any> {
-    return;
-  }
+  readGender(): Promise<any> { return; }
 
   /**
-   * Output = I|II|III|IV|V|VI|unknown
-   * @returns {Promise<any>}
-   */
+ * Output = A+|A-|B+|B-|AB+|AB-|O+|O-|unknown
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  readFitzpatrickSkinType(): Promise<any> {
-    return;
-  }
+  readBloodType(): Promise<any> { return; }
 
   /**
-   * Pass in unit (g=gram, kg=kilogram, oz=ounce, lb=pound, st=stone) and amount
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ * Output = I|II|III|IV|V|VI|unknown
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  saveWeight(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  readFitzpatrickSkinType(): Promise<any> { return; }
 
   /**
-   * Pass in unit (g=gram, kg=kilogram, oz=ounce, lb=pound, st=stone)
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ * Pass in unit (g=gram, kg=kilogram, oz=ounce, lb=pound, st=stone) and amount
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  readWeight(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  saveWeight(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   * Pass in unit (mm=millimeter, cm=centimeter, m=meter, in=inch, ft=foot) and amount
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ * Pass in unit (g=gram, kg=kilogram, oz=ounce, lb=pound, st=stone)
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  saveHeight(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  readWeight(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   * Pass in unit (mm=millimeter, cm=centimeter, m=meter, in=inch, ft=foot)
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ * Pass in unit (mm=millimeter, cm=centimeter, m=meter, in=inch, ft=foot) and amount
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  readHeight(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  saveHeight(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   * no params yet, so this will return all workouts ever of any type
-   * @returns {Promise<any>}
-   */
+ * Pass in unit (mm=millimeter, cm=centimeter, m=meter, in=inch, ft=foot)
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  findWorkouts(): Promise<any> {
-    return;
-  }
+  readHeight(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   *
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ * no params yet, so this will return all workouts ever of any type
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  saveWorkout(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  findWorkouts(): Promise<any> { return; }
 
   /**
-   *
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ *
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  querySampleType(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  saveWorkout(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   *
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ *
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  querySampleTypeAggregated(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  querySampleType(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   *
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ *
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  deleteSamples(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  querySampleTypeAggregated(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   *
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ *
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  monitorSampleType(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  deleteSamples(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   *
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ *
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  sumQuantityType(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  monitorSampleType(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   *
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ *
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  saveQuantitySample(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  sumQuantityType(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   *
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ *
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  saveCorrelation(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  saveQuantitySample(options: HealthKitOptions): Promise<any> { return; }
 
   /**
-   *
-   * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
-   */
+ *
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  queryCorrelationType(options: HealthKitOptions): Promise<any> {
-    return;
-  }
+  saveCorrelation(options: HealthKitOptions): Promise<any> { return; }
+
+  /**
+ *
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
+  @Cordova()
+  queryCorrelationType(options: HealthKitOptions): Promise<any> { return; }
+
+
 }
diff --git a/src/@ionic-native/plugins/health/index.ts b/src/@ionic-native/plugins/health/index.ts
index c498624cd..85b09fe97 100644
--- a/src/@ionic-native/plugins/health/index.ts
+++ b/src/@ionic-native/plugins/health/index.ts
@@ -1,18 +1,18 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @hidden
  */
 export interface HealthDataType {
   /**
-   * Read only date types (see https://github.com/dariosalvi78/cordova-plugin-health#supported-data-types)
-   */
+  * Read only date types (see https://github.com/dariosalvi78/cordova-plugin-health#supported-data-types)
+  */
   read?: string[];
 
   /**
-   * Write only date types (see https://github.com/dariosalvi78/cordova-plugin-health#supported-data-types)
-   */
+  * Write only date types (see https://github.com/dariosalvi78/cordova-plugin-health#supported-data-types)
+  */
   write?: string[];
 }
 
@@ -201,6 +201,7 @@ export interface HealthData {
 })
 @Injectable()
 export class Health extends IonicNativePlugin {
+
   /**
    * Tells if either Google Fit or HealthKit are available.
    *
@@ -209,9 +210,7 @@ export class Health extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  isAvailable(): Promise<boolean> {
-    return;
-  }
+  isAvailable(): Promise<boolean> { return; }
 
   /**
    * Checks if recent Google Play Services and Google Fit are installed. If the play services are not installed,
@@ -227,9 +226,7 @@ export class Health extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  promptInstallFit(): Promise<any> {
-    return;
-  }
+  promptInstallFit(): Promise<any> { return; }
 
   /**
    * Requests read and/or write access to a set of data types. It is recommendable to always explain why the app
@@ -251,11 +248,7 @@ export class Health extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  requestAuthorization(
-    datatypes: Array<string | HealthDataType>
-  ): Promise<any> {
-    return;
-  }
+  requestAuthorization(datatypes: Array<string | HealthDataType>): Promise<any> { return; }
 
   /**
    * Check if the app has authorization to read/write a set of datatypes.
@@ -269,9 +262,7 @@ export class Health extends IonicNativePlugin {
    * @return {Promise<boolean>} Returns a promise that resolves with a boolean that indicates the authorization status
    */
   @Cordova()
-  isAuthorized(datatypes: Array<string | HealthDataType>): Promise<boolean> {
-    return;
-  }
+  isAuthorized(datatypes: Array<string | HealthDataType>): Promise<boolean> { return; }
 
   /**
    * Gets all the data points of a certain data type within a certain time window.
@@ -305,9 +296,7 @@ export class Health extends IonicNativePlugin {
    * @return {Promise<HealthData>}
    */
   @Cordova()
-  query(queryOptions: HealthQueryOptions): Promise<HealthData> {
-    return;
-  }
+  query(queryOptions: HealthQueryOptions): Promise<HealthData> { return; }
 
   /**
    * Gets aggregated data in a certain time window. Usually the sum is returned for the given quantity.
@@ -331,11 +320,7 @@ export class Health extends IonicNativePlugin {
    * @return {Promise<HealthData[]>}
    */
   @Cordova()
-  queryAggregated(
-    queryOptionsAggregated: HealthQueryOptionsAggregated
-  ): Promise<HealthData[]> {
-    return;
-  }
+  queryAggregated(queryOptionsAggregated: HealthQueryOptionsAggregated): Promise<HealthData[]> { return; }
 
   /**
    * Stores a data point.
@@ -352,7 +337,6 @@ export class Health extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  store(storeOptions: HealthStoreOptions): Promise<any> {
-    return;
-  }
+  store(storeOptions: HealthStoreOptions): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/hotspot/index.ts b/src/@ionic-native/plugins/hotspot/index.ts
index bfe6757ea..97d58ba90 100644
--- a/src/@ionic-native/plugins/hotspot/index.ts
+++ b/src/@ionic-native/plugins/hotspot/index.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface HotspotConnectionInfo {
+
   /**
    *      The service set identifier (SSID) of the current 802.11 network.
    */
@@ -26,9 +27,11 @@ export interface HotspotConnectionInfo {
    *      Each configured network has a unique small integer ID, used to identify the network when performing operations on the supplicant.
    */
   networkID: string;
+
 }
 
 export interface HotspotNetwork {
+
   /**
    *      Human readable network name
    */
@@ -58,8 +61,10 @@ export interface HotspotNetwork {
    *      Describes the authentication, key management, and encryption schemes supported by the access point.
    */
   capabilities: string;
+
 }
 export interface HotspotNetworkConfig {
+
   /**
    *   Device IP Address
    */
@@ -79,9 +84,11 @@ export interface HotspotNetworkConfig {
    *   Gateway MAC Address
    */
   gatewayMacAddress: string;
+
 }
 
 export interface HotspotDevice {
+
   /**
    *      Hotspot IP Address
    */
@@ -91,6 +98,7 @@ export interface HotspotDevice {
    *      Hotspot MAC Address
    */
   mac: string;
+
 }
 
 /**
@@ -126,21 +134,18 @@ export interface HotspotDevice {
 })
 @Injectable()
 export class Hotspot extends IonicNativePlugin {
-  /**
-   * @returns {Promise<boolean>}
-   */
-  @Cordova()
-  isAvailable(): Promise<boolean> {
-    return;
-  }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  toggleWifi(): Promise<boolean> {
-    return;
-  }
+  isAvailable(): Promise<boolean> { return; }
+
+  /**
+   * @returns {Promise<boolean>}
+   */
+  @Cordova()
+  toggleWifi(): Promise<boolean> { return; }
 
   /**
    * Configures and starts hotspot with SSID and Password
@@ -152,9 +157,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<void>}        - Promise to call once hotspot is started, or reject upon failure
    */
   @Cordova()
-  createHotspot(ssid: string, mode: string, password: string): Promise<void> {
-    return;
-  }
+  createHotspot(ssid: string, mode: string, password: string): Promise<void> { return; }
 
   /**
    * Turns on Access Point
@@ -162,9 +165,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<boolean>} - true if AP is started
    */
   @Cordova()
-  startHotspot(): Promise<boolean> {
-    return;
-  }
+  startHotspot(): Promise<boolean> { return; }
 
   /**
    * Configures hotspot with SSID and Password
@@ -176,13 +177,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<void>}        - Promise to call when hotspot is configured, or reject upon failure
    */
   @Cordova()
-  configureHotspot(
-    ssid: string,
-    mode: string,
-    password: string
-  ): Promise<void> {
-    return;
-  }
+  configureHotspot(ssid: string, mode: string, password: string): Promise<void> { return; }
 
   /**
    * Turns off Access Point
@@ -190,9 +185,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<boolean>} - Promise to turn off the hotspot, true on success, false on failure
    */
   @Cordova()
-  stopHotspot(): Promise<boolean> {
-    return;
-  }
+  stopHotspot(): Promise<boolean> { return; }
 
   /**
    * Checks if hotspot is enabled
@@ -200,17 +193,13 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<void>}    - Promise that hotspot is enabled, rejected if it is not enabled
    */
   @Cordova()
-  isHotspotEnabled(): Promise<void> {
-    return;
-  }
+  isHotspotEnabled(): Promise<void> { return; }
 
   /**
    * @returns {Promise<Array<HotspotDevice>>}
    */
   @Cordova()
-  getAllHotspotDevices(): Promise<Array<HotspotDevice>> {
-    return;
-  }
+  getAllHotspotDevices(): Promise<Array<HotspotDevice>> { return; }
 
   /**
    * Connect to a WiFi network
@@ -224,9 +213,7 @@ export class Hotspot extends IonicNativePlugin {
    *      Promise that connection to the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  connectToWifi(ssid: string, password: string): Promise<void> {
-    return;
-  }
+  connectToWifi(ssid: string, password: string): Promise<void> { return; }
 
   /**
    * Connect to a WiFi network
@@ -244,14 +231,7 @@ export class Hotspot extends IonicNativePlugin {
    *      Promise that connection to the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  connectToWifiAuthEncrypt(
-    ssid: string,
-    password: string,
-    authentication: string,
-    encryption: Array<string>
-  ): Promise<void> {
-    return;
-  }
+  connectToWifiAuthEncrypt(ssid: string, password: string, authentication: string, encryption: Array<string>): Promise<void> { return; }
 
   /**
    * Add a WiFi network
@@ -267,9 +247,7 @@ export class Hotspot extends IonicNativePlugin {
    *      Promise that adding the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  addWifiNetwork(ssid: string, mode: string, password: string): Promise<void> {
-    return;
-  }
+  addWifiNetwork(ssid: string, mode: string, password: string): Promise<void> { return; }
 
   /**
    * Remove a WiFi network
@@ -281,105 +259,79 @@ export class Hotspot extends IonicNativePlugin {
    *      Promise that removing the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  removeWifiNetwork(ssid: string): Promise<void> {
-    return;
-  }
+  removeWifiNetwork(ssid: string): Promise<void> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isConnectedToInternet(): Promise<boolean> {
-    return;
-  }
+  isConnectedToInternet(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isConnectedToInternetViaWifi(): Promise<boolean> {
-    return;
-  }
+  isConnectedToInternetViaWifi(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isWifiOn(): Promise<boolean> {
-    return;
-  }
+  isWifiOn(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isWifiSupported(): Promise<boolean> {
-    return;
-  }
+  isWifiSupported(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isWifiDirectSupported(): Promise<boolean> {
-    return;
-  }
+  isWifiDirectSupported(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<Array<HotspotNetwork>>}
    */
   @Cordova()
-  scanWifi(): Promise<Array<HotspotNetwork>> {
-    return;
-  }
+  scanWifi(): Promise<Array<HotspotNetwork>> { return; }
 
   /**
    * @returns {Promise<Array<HotspotNetwork>>}
    */
   @Cordova()
-  scanWifiByLevel(): Promise<Array<HotspotNetwork>> {
-    return;
-  }
+  scanWifiByLevel(): Promise<Array<HotspotNetwork>> { return; }
 
   /**
    * @returns {Promise<any>}
    */
   @Cordova()
-  startWifiPeriodicallyScan(interval: number, duration: number): Promise<any> {
-    return;
-  }
+  startWifiPeriodicallyScan(interval: number, duration: number): Promise<any> { return; }
 
   /**
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopWifiPeriodicallyScan(): Promise<any> {
-    return;
-  }
+  stopWifiPeriodicallyScan(): Promise<any> { return; }
 
   /**
    * @returns {Promise<HotspotNetworkConfig>}
    */
   @Cordova()
-  getNetConfig(): Promise<HotspotNetworkConfig> {
-    return;
-  }
+  getNetConfig(): Promise<HotspotNetworkConfig> { return; }
 
   /**
    * @returns {Promise<HotspotConnectionInfo>}
    */
   @Cordova()
-  getConnectionInfo(): Promise<HotspotConnectionInfo> {
-    return;
-  }
+  getConnectionInfo(): Promise<HotspotConnectionInfo> { return; }
 
   /**
    * @returns {Promise<string>}
    */
   @Cordova()
-  pingHost(ip: string): Promise<string> {
-    return;
-  }
+  pingHost(ip: string): Promise<string> { return; }
 
   /**
    * Gets MAC Address associated with IP Address from ARP File
@@ -389,9 +341,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<string>}  - A Promise for the MAC Address
    */
   @Cordova()
-  getMacAddressOfHost(ip: string): Promise<string> {
-    return;
-  }
+  getMacAddressOfHost(ip: string): Promise<string> { return; }
 
   /**
    * Checks if IP is live using DNS
@@ -401,9 +351,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<boolean>} - A Promise for whether the IP Address is reachable
    */
   @Cordova()
-  isDnsLive(ip: string): Promise<boolean> {
-    return;
-  }
+  isDnsLive(ip: string): Promise<boolean> { return; }
 
   /**
    * Checks if IP is live using socket And PORT
@@ -413,9 +361,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<boolean>} - A Promise for whether the IP Address is reachable
    */
   @Cordova()
-  isPortLive(ip: string): Promise<boolean> {
-    return;
-  }
+  isPortLive(ip: string): Promise<boolean> { return; }
 
   /**
    * Checks if device is rooted
@@ -423,7 +369,6 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<boolean>} - A Promise for whether the device is rooted
    */
   @Cordova()
-  isRooted(): Promise<boolean> {
-    return;
-  }
+  isRooted(): Promise<boolean> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/http/index.ts b/src/@ionic-native/plugins/http/index.ts
index 878415b84..56c84069d 100644
--- a/src/@ionic-native/plugins/http/index.ts
+++ b/src/@ionic-native/plugins/http/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface HTTPResponse {
   /**
@@ -66,6 +66,7 @@ export interface HTTPResponse {
 })
 @Injectable()
 export class HTTP extends IonicNativePlugin {
+
   /**
    * This returns an object representing a basic HTTP Authorization header of the form.
    * @param username {string} Username
@@ -73,12 +74,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Object} an object representing a basic HTTP Authorization header of the form {'Authorization': 'Basic base64encodedusernameandpassword'}
    */
   @Cordova({ sync: true })
-  getBasicAuthHeader(
-    username: string,
-    password: string
-  ): { Authorization: string } {
-    return;
-  }
+  getBasicAuthHeader(username: string, password: string): { Authorization: string; } { return; }
 
   /**
    * This sets up all future requests to use Basic HTTP authentication with the given username and password.
@@ -86,7 +82,7 @@ export class HTTP extends IonicNativePlugin {
    * @param password {string} Password
    */
   @Cordova({ sync: true })
-  useBasicAuth(username: string, password: string): void {}
+  useBasicAuth(username: string, password: string): void { }
 
   /**
    * Set a header for all future requests. Takes a header and a value.
@@ -94,20 +90,20 @@ export class HTTP extends IonicNativePlugin {
    * @param value {string} The value of the header
    */
   @Cordova({ sync: true })
-  setHeader(header: string, value: string): void {}
+  setHeader(header: string, value: string): void { }
 
   /**
    * Set the data serializer which will be used for all future POST and PUT requests. Takes a string representing the name of the serializer.
    * @param serializer {string} The name of the serializer. Can be urlencoded or json
    */
   @Cordova({ sync: true })
-  setDataSerializer(serializer: string): void {}
+  setDataSerializer(serializer: string): void { }
 
   /**
    * Clear all cookies
    */
   @Cordova({ sync: true })
-  clearCookies(): void {}
+  clearCookies(): void { }
 
   /**
    * Remove cookies
@@ -115,21 +111,21 @@ export class HTTP extends IonicNativePlugin {
    * @param cb
    */
   @Cordova({ sync: true })
-  removeCookies(url: string, cb: () => void): void {}
+  removeCookies(url: string, cb: () => void): void { }
 
   /**
    * Disable following redirects automatically
    * @param disable {boolean} Set to true to disable following redirects automatically
    */
   @Cordova({ sync: true })
-  disableRedirect(disable: boolean): void {}
+  disableRedirect(disable: boolean): void { }
 
   /**
    * Set request timeout
    * @param timeout {number} The timeout in seconds. Default 60
    */
   @Cordova({ sync: true })
-  setRequestTimeout(timeout: number): void {}
+  setRequestTimeout(timeout: number): void { }
 
   /**
    * Enable or disable SSL Pinning. This defaults to false.
@@ -141,9 +137,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<void>} returns a promise that will resolve on success, and reject on failure
    */
   @Cordova()
-  enableSSLPinning(enable: boolean): Promise<void> {
-    return;
-  }
+  enableSSLPinning(enable: boolean): Promise<void> { return; }
 
   /**
    * Accept all SSL certificates. Or disabled accepting all certificates. Defaults to false.
@@ -151,9 +145,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<void>} returns a promise that will resolve on success, and reject on failure
    */
   @Cordova()
-  acceptAllCerts(accept: boolean): Promise<void> {
-    return;
-  }
+  acceptAllCerts(accept: boolean): Promise<void> { return; }
 
   /**
    * Make a POST request
@@ -163,9 +155,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  post(url: string, body: any, headers: any): Promise<HTTPResponse> {
-    return;
-  }
+  post(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
 
   /**
    * Make a GET request
@@ -175,9 +165,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  get(url: string, parameters: any, headers: any): Promise<HTTPResponse> {
-    return;
-  }
+  get(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
 
   /**
    * Make a PUT request
@@ -187,9 +175,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  put(url: string, body: any, headers: any): Promise<HTTPResponse> {
-    return;
-  }
+  put(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
 
   /**
    * Make a PATCH request
@@ -199,9 +185,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  patch(url: string, body: any, headers: any): Promise<HTTPResponse> {
-    return;
-  }
+  patch(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
 
   /**
    * Make a DELETE request
@@ -211,9 +195,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  delete(url: string, parameters: any, headers: any): Promise<HTTPResponse> {
-    return;
-  }
+  delete(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
 
   /**
    * Make a HEAD request
@@ -223,9 +205,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  head(url: string, parameters: any, headers: any): Promise<HTTPResponse> {
-    return;
-  }
+  head(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
 
   /**
    *
@@ -237,15 +217,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  uploadFile(
-    url: string,
-    body: any,
-    headers: any,
-    filePath: string,
-    name: string
-  ): Promise<HTTPResponse> {
-    return;
-  }
+  uploadFile(url: string, body: any, headers: any, filePath: string, name: string): Promise<HTTPResponse> { return; }
 
   /**
    *
@@ -256,12 +228,5 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  downloadFile(
-    url: string,
-    body: any,
-    headers: any,
-    filePath: string
-  ): Promise<HTTPResponse> {
-    return;
-  }
+  downloadFile(url: string, body: any, headers: any, filePath: string): Promise<HTTPResponse> { return; }
 }
diff --git a/src/@ionic-native/plugins/httpd/index.ts b/src/@ionic-native/plugins/httpd/index.ts
index 875ae5c54..d529b0dbc 100644
--- a/src/@ionic-native/plugins/httpd/index.ts
+++ b/src/@ionic-native/plugins/httpd/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface HttpdOptions {
@@ -56,6 +56,7 @@ export interface HttpdOptions {
 })
 @Injectable()
 export class Httpd extends IonicNativePlugin {
+
   /**
    * Starts a web server.
    * @param options {HttpdOptions}
@@ -65,25 +66,20 @@ export class Httpd extends IonicNativePlugin {
     observable: true,
     clearFunction: 'stopServer'
   })
-  startServer(options?: HttpdOptions): Observable<string> {
-    return;
-  }
+  startServer(options?: HttpdOptions): Observable<string> { return; }
 
   /**
    * Gets the URL of the running server
    * @returns {Promise<string>} Returns a promise that resolves with the URL of the web server.
    */
   @Cordova()
-  getUrl(): Promise<string> {
-    return;
-  }
+  getUrl(): Promise<string> { return; }
 
   /**
    * Get the local path of the running webserver
    * @returns {Promise<string>} Returns a promise that resolves with the local path of the web server.
-   */
+    */
   @Cordova()
-  getLocalPath(): Promise<string> {
-    return;
-  }
+  getLocalPath(): Promise<string> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/hyper-track/index.ts b/src/@ionic-native/plugins/hyper-track/index.ts
index 55d287525..3f8c70619 100644
--- a/src/@ionic-native/plugins/hyper-track/index.ts
+++ b/src/@ionic-native/plugins/hyper-track/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @beta
@@ -56,8 +56,8 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
  *   this.hyperTrack.stopTracking().then(success => {
  *     // Handle success (String). Should be "OK".
  *   }, error => {});
- *
- * }, error => {});*
+ * 
+ * }, error => {});* 
  * ```
  */
 @Plugin({
@@ -75,9 +75,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the result text (which is the same as the given text) if successful, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  helloWorld(text: String): Promise<String> {
-    return;
-  }
+  helloWorld(text: String): Promise<String> { return; }
 
   /**
    * Create a new user to identify the current device or get a user from a lookup id.
@@ -88,14 +86,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with a string representation of the User's JSON, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  getOrCreateUser(
-    name: String,
-    phone: String,
-    photo: String,
-    lookupId: String
-  ): Promise<any> {
-    return;
-  }
+  getOrCreateUser(name: String, phone: String, photo: String, lookupId: String): Promise<any> { return; }
 
   /**
    * Set UserId for the SDK created using HyperTrack APIs. This is useful if you already have a user previously created.
@@ -103,18 +94,14 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with an "OK" string if successful, or it gets rejected if an error ocurred. An "OK" response doesn't necessarily mean that the userId was found. It just means that it was set correctly.
    */
   @Cordova()
-  setUserId(userId: String): Promise<any> {
-    return;
-  }
+  setUserId(userId: String): Promise<any> { return; }
 
   /**
    * Enable the SDK and start tracking. This will fail if there is no user set.
    * @returns {Promise<any>} Returns a Promise that resolves with the userId (String) of the User being tracked if successful, or it gets rejected if an error ocurred. One example of an error is not setting a User with getOrCreateUser() or setUserId() before calling this function.
    */
   @Cordova()
-  startTracking(): Promise<any> {
-    return;
-  }
+  startTracking(): Promise<any> { return; }
 
   /**
    * Create and assign an action to the current user using specified parameters
@@ -126,15 +113,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with a string representation of the Action's JSON, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  createAndAssignAction(
-    type: String,
-    lookupId: String,
-    expectedPlaceAddress: String,
-    expectedPlaceLatitude: Number,
-    expectedPlaceLongitude: Number
-  ): Promise<any> {
-    return;
-  }
+  createAndAssignAction(type: String, lookupId: String, expectedPlaceAddress: String, expectedPlaceLatitude: Number, expectedPlaceLongitude: Number): Promise<any> { return; }
 
   /**
    * Complete an action from the SDK by its ID
@@ -142,9 +121,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with an "OK" string if successful, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  completeAction(actionId: String): Promise<any> {
-    return;
-  }
+  completeAction(actionId: String): Promise<any> { return; }
 
   /**
    * Complete an action from the SDK using Action's lookupId as parameter
@@ -152,9 +129,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with an "OK" string if successful, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  completeActionWithLookupId(lookupId: String): Promise<any> {
-    return;
-  }
+  completeActionWithLookupId(lookupId: String): Promise<any> { return; }
 
   /**
    * Disable the SDK and stop tracking.
@@ -162,18 +137,14 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the an "OK" string if successful, or it gets rejected if an error ocurred. One example of an error is not setting a User with getOrCreateUser() or setUserId() before calling this function.
    */
   @Cordova()
-  stopTracking(): Promise<any> {
-    return;
-  }
+  stopTracking(): Promise<any> { return; }
 
   /**
    * Get user's current location from the SDK
    * @returns {Promise<any>} Returns a Promise that resolves with a string representation of the Location's JSON, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  getCurrentLocation(): Promise<any> {
-    return;
-  }
+  getCurrentLocation(): Promise<any> { return; }
 
   /**
    * Check if Location permission has been granted to the app (for Android).
@@ -181,9 +152,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if location permission was granted, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  checkLocationPermission(): Promise<any> {
-    return;
-  }
+  checkLocationPermission(): Promise<any> { return; }
 
   /**
    * Request user to grant Location access to the app (for Anrdoid).
@@ -191,9 +160,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if Location access was given to the app, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  requestPermissions(): Promise<any> {
-    return;
-  }
+  requestPermissions(): Promise<any> { return; }
 
   /**
    * Check if Location services are enabled on the device (for Android).
@@ -201,9 +168,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if location services are enabled, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  checkLocationServices(): Promise<any> {
-    return;
-  }
+  checkLocationServices(): Promise<any> { return; }
 
   /**
    * Request user to enable Location services on the device.
@@ -211,7 +176,5 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if Location services were enabled, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  requestLocationServices(): Promise<any> {
-    return;
-  }
+  requestLocationServices(): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/ibeacon/index.ts b/src/@ionic-native/plugins/ibeacon/index.ts
index 6a3f4f89f..8b77afed0 100644
--- a/src/@ionic-native/plugins/ibeacon/index.ts
+++ b/src/@ionic-native/plugins/ibeacon/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare const cordova: any;
@@ -34,11 +29,7 @@ export interface Beacon {
    * ProximityFar
    * ProximityUnknown
    */
-  proximity:
-    | 'ProximityImmediate'
-    | 'ProximityNear'
-    | 'ProximityFar'
-    | 'ProximityUnknown';
+  proximity: 'ProximityImmediate' | 'ProximityNear' | 'ProximityFar' | 'ProximityUnknown';
 
   /**
    * Transmission Power of the beacon. A constant emitted by the beacon which indicates what's the expected RSSI at a distance of 1 meter to the beacon.
@@ -55,6 +46,7 @@ export interface Beacon {
    * The accuracy of the ranging.
    */
   accuracy: number;
+
 }
 
 export interface BeaconRegion {
@@ -112,6 +104,7 @@ export interface CircularRegion {
 export type Region = BeaconRegion | CircularRegion;
 
 export interface IBeaconPluginResult {
+
   /**
    * The name of the delegate function that produced the PluginResult object.
    */
@@ -294,6 +287,7 @@ export interface IBeaconDelegate {
 })
 @Injectable()
 export class IBeacon extends IonicNativePlugin {
+
   /**
    * Instances of this class are delegates between the {@link LocationManager} and
    * the code that consumes the messages generated on in the native layer.
@@ -304,79 +298,85 @@ export class IBeacon extends IonicNativePlugin {
   Delegate(): IBeaconDelegate {
     let delegate = new cordova.plugins.locationManager.Delegate();
 
-    delegate.didChangeAuthorizationStatus = (
-      pluginResult?: IBeaconPluginResult
-    ) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
-        return (delegate.didChangeAuthorizationStatus = cb);
-      });
+    delegate.didChangeAuthorizationStatus = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
+        (observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.didChangeAuthorizationStatus = cb;
+        }
+      );
     };
 
-    delegate.didDetermineStateForRegion = (
-      pluginResult?: IBeaconPluginResult
-    ) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
-        return (delegate.didDetermineStateForRegion = cb);
-      });
+    delegate.didDetermineStateForRegion = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
+        (observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.didDetermineStateForRegion = cb;
+        }
+      );
     };
 
     delegate.didEnterRegion = (pluginResult?: IBeaconPluginResult) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
-        return (delegate.didEnterRegion = cb);
-      });
+      return new Observable<IBeaconPluginResult>(
+        (observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.didEnterRegion = cb;
+        }
+      );
     };
 
     delegate.didExitRegion = (pluginResult?: IBeaconPluginResult) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
-        return (delegate.didExitRegion = cb);
-      });
+      return new Observable<IBeaconPluginResult>(
+        (observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.didExitRegion = cb;
+        }
+      );
     };
 
     delegate.didRangeBeaconsInRegion = (pluginResult?: IBeaconPluginResult) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
-        return (delegate.didRangeBeaconsInRegion = cb);
-      });
+      return new Observable<IBeaconPluginResult>(
+        (observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.didRangeBeaconsInRegion = cb;
+        }
+      );
     };
 
-    delegate.didStartMonitoringForRegion = (
-      pluginResult?: IBeaconPluginResult
-    ) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
-        return (delegate.didStartMonitoringForRegion = cb);
-      });
+    delegate.didStartMonitoringForRegion = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
+        (observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.didStartMonitoringForRegion = cb;
+        }
+      );
     };
 
-    delegate.monitoringDidFailForRegionWithError = (
-      pluginResult?: IBeaconPluginResult
-    ) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
-        return (delegate.monitoringDidFailForRegionWithError = cb);
-      });
+    delegate.monitoringDidFailForRegionWithError = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
+        (observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.monitoringDidFailForRegionWithError = cb;
+        }
+      );
     };
 
-    delegate.peripheralManagerDidStartAdvertising = (
-      pluginResult?: IBeaconPluginResult
-    ) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
-        return (delegate.peripheralManagerDidStartAdvertising = cb);
-      });
+    delegate.peripheralManagerDidStartAdvertising = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
+        (observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.peripheralManagerDidStartAdvertising = cb;
+        }
+      );
     };
 
-    delegate.peripheralManagerDidUpdateState = (
-      pluginResult?: IBeaconPluginResult
-    ) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
-        return (delegate.peripheralManagerDidUpdateState = cb);
-      });
+    delegate.peripheralManagerDidUpdateState = (pluginResult?: IBeaconPluginResult) => {
+      return new Observable<IBeaconPluginResult>(
+        (observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.peripheralManagerDidUpdateState = cb;
+        }
+      );
     };
 
     cordova.plugins.locationManager.setDelegate(delegate);
@@ -396,29 +396,15 @@ export class IBeacon extends IonicNativePlugin {
    * @returns {BeaconRegion} Returns the BeaconRegion that was created
    */
   @CordovaCheck({ sync: true })
-  BeaconRegion(
-    identifer: string,
-    uuid: string,
-    major?: number,
-    minor?: number,
-    notifyEntryStateOnDisplay?: boolean
-  ): BeaconRegion {
-    return new cordova.plugins.locationManager.BeaconRegion(
-      identifer,
-      uuid,
-      major,
-      minor,
-      notifyEntryStateOnDisplay
-    );
+  BeaconRegion(identifer: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion {
+    return new cordova.plugins.locationManager.BeaconRegion(identifer, uuid, major, minor, notifyEntryStateOnDisplay);
   }
 
   /**
    * @returns {IBeaconDelegate} Returns the IBeaconDelegate
    */
   @Cordova()
-  getDelegate(): IBeaconDelegate {
-    return;
-  }
+  getDelegate(): IBeaconDelegate { return; }
 
   /**
    * @param {IBeaconDelegate} delegate An instance of a delegate to register with the native layer.
@@ -426,9 +412,7 @@ export class IBeacon extends IonicNativePlugin {
    * @returns {IBeaconDelegate} Returns the IBeaconDelegate
    */
   @Cordova()
-  setDelegate(delegate: IBeaconDelegate): IBeaconDelegate {
-    return;
-  }
+  setDelegate(delegate: IBeaconDelegate): IBeaconDelegate { return; }
 
   /**
    * Signals the native layer that the client side is ready to consume messages.
@@ -451,9 +435,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the request and started to send events.
    */
   @Cordova({ otherPromise: true })
-  onDomDelegateReady(): Promise<void> {
-    return;
-  }
+  onDomDelegateReady(): Promise<void> { return; }
 
   /**
    * Determines if bluetooth is switched on, according to the native layer.
@@ -461,9 +443,7 @@ export class IBeacon extends IonicNativePlugin {
    * indicating whether bluetooth is active.
    */
   @Cordova({ otherPromise: true })
-  isBluetoothEnabled(): Promise<boolean> {
-    return;
-  }
+  isBluetoothEnabled(): Promise<boolean> { return; }
 
   /**
    * Enables Bluetooth using the native Layer. (ANDROID ONLY)
@@ -472,9 +452,7 @@ export class IBeacon extends IonicNativePlugin {
    * could be enabled. If not, the promise will be rejected with an error.
    */
   @Cordova({ otherPromise: true })
-  enableBluetooth(): Promise<void> {
-    return;
-  }
+  enableBluetooth(): Promise<void> { return; }
 
   /**
    * Disables Bluetooth using the native Layer. (ANDROID ONLY)
@@ -483,9 +461,7 @@ export class IBeacon extends IonicNativePlugin {
    * could be enabled. If not, the promise will be rejected with an error.
    */
   @Cordova({ otherPromise: true })
-  disableBluetooth(): Promise<void> {
-    return;
-  }
+  disableBluetooth(): Promise<void> { return; }
 
   /**
    * Start monitoring the specified region.
@@ -505,9 +481,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the monitoring request.
    */
   @Cordova({ otherPromise: true })
-  startMonitoringForRegion(region: BeaconRegion): Promise<string> {
-    return;
-  }
+  startMonitoringForRegion(region: BeaconRegion): Promise<string> { return; }
 
   /**
    * Stop monitoring the specified region.  It is valid to call
@@ -524,9 +498,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({ otherPromise: true })
-  stopMonitoringForRegion(region: BeaconRegion): Promise<void> {
-    return;
-  }
+  stopMonitoringForRegion(region: BeaconRegion): Promise<void> { return; }
 
   /**
    * Request state the for specified region. When result is ready
@@ -542,9 +514,8 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({ otherPromise: true })
-  requestStateForRegion(region: Region): Promise<void> {
-    return;
-  }
+  requestStateForRegion(region: Region): Promise<void> { return; }
+
 
   /**
    * Start ranging the specified beacon region.
@@ -561,9 +532,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the monitoring request.
    */
   @Cordova({ otherPromise: true })
-  startRangingBeaconsInRegion(region: BeaconRegion): Promise<void> {
-    return;
-  }
+  startRangingBeaconsInRegion(region: BeaconRegion): Promise<void> { return; }
 
   /**
    * Stop ranging the specified region.  It is valid to call
@@ -580,9 +549,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({ otherPromise: true })
-  stopRangingBeaconsInRegion(region: BeaconRegion): Promise<void> {
-    return;
-  }
+  stopRangingBeaconsInRegion(region: BeaconRegion): Promise<void> { return; }
 
   /**
    * Queries the native layer to determine the current authorization in effect.
@@ -591,9 +558,7 @@ export class IBeacon extends IonicNativePlugin {
    * requested authorization status.
    */
   @Cordova({ otherPromise: true })
-  getAuthorizationStatus(): Promise<IBeaconPluginResult> {
-    return;
-  }
+  getAuthorizationStatus(): Promise<IBeaconPluginResult> { return; }
 
   /**
    * For iOS 8 and above only. The permission model has changed by Apple in iOS 8, making it necessary for apps to
@@ -605,9 +570,8 @@ export class IBeacon extends IonicNativePlugin {
    * @returns {Promise<void>} Returns a promise that is resolved when the request dialog is shown.
    */
   @Cordova({ otherPromise: true })
-  requestWhenInUseAuthorization(): Promise<void> {
-    return;
-  }
+  requestWhenInUseAuthorization(): Promise<void> { return; }
+
 
   /**
    * See the documentation of {@code requestWhenInUseAuthorization} for further details.
@@ -616,9 +580,7 @@ export class IBeacon extends IonicNativePlugin {
    * shows the request dialog.
    */
   @Cordova({ otherPromise: true })
-  requestAlwaysAuthorization(): Promise<void> {
-    return;
-  }
+  requestAlwaysAuthorization(): Promise<void> { return; }
 
   /**
    *
@@ -626,9 +588,7 @@ export class IBeacon extends IonicNativePlugin {
    * of {Region} instances that are being monitored by the native layer.
    */
   @Cordova({ otherPromise: true })
-  getMonitoredRegions(): Promise<Region[]> {
-    return;
-  }
+  getMonitoredRegions(): Promise<Region[]> { return; }
 
   /**
    *
@@ -636,9 +596,7 @@ export class IBeacon extends IonicNativePlugin {
    * of {Region} instances that are being ranged by the native layer.
    */
   @Cordova({ otherPromise: true })
-  getRangedRegions(): Promise<Region[]> {
-    return;
-  }
+  getRangedRegions(): Promise<Region[]> { return; }
 
   /**
    * Determines if ranging is available or not, according to the native layer.
@@ -646,9 +604,7 @@ export class IBeacon extends IonicNativePlugin {
    * indicating whether ranging is available or not.
    */
   @Cordova({ otherPromise: true })
-  isRangingAvailable(): Promise<boolean> {
-    return;
-  }
+  isRangingAvailable(): Promise<boolean> { return; }
 
   /**
    * Determines if region type is supported or not, according to the native layer.
@@ -660,9 +616,7 @@ export class IBeacon extends IonicNativePlugin {
    * indicating whether the region type is supported or not.
    */
   @Cordova({ otherPromise: true })
-  isMonitoringAvailableForClass(region: Region): Promise<boolean> {
-    return;
-  }
+  isMonitoringAvailableForClass(region: Region): Promise<boolean> { return; }
 
   /**
    * Start advertising the specified region.
@@ -682,9 +636,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the advertising request.
    */
   @Cordova({ otherPromise: true })
-  startAdvertising(region: Region, measuredPower?: number): Promise<void> {
-    return;
-  }
+  startAdvertising(region: Region, measuredPower?: number): Promise<void> { return; }
 
   /**
    * Stop advertising as a beacon.
@@ -695,9 +647,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the request to stop advertising.
    */
   @Cordova({ otherPromise: true })
-  stopAdvertising(region: Region): Promise<void> {
-    return;
-  }
+  stopAdvertising(region: Region): Promise<void> { return; }
 
   /**
    * Determines if advertising is available or not, according to the native layer.
@@ -705,9 +655,7 @@ export class IBeacon extends IonicNativePlugin {
    * indicating whether advertising is available or not.
    */
   @Cordova({ otherPromise: true })
-  isAdvertisingAvailable(): Promise<boolean> {
-    return;
-  }
+  isAdvertisingAvailable(): Promise<boolean> { return; }
 
   /**
    * Determines if advertising is currently active, according to the native layer.
@@ -715,9 +663,7 @@ export class IBeacon extends IonicNativePlugin {
    * indicating whether advertising is active.
    */
   @Cordova({ otherPromise: true })
-  isAdvertising(): Promise<boolean> {
-    return;
-  }
+  isAdvertising(): Promise<boolean> { return; }
 
   /**
    * Disables debug logging in the native layer. Use this method if you want
@@ -727,9 +673,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer has set the logging level accordingly.
    */
   @Cordova({ otherPromise: true })
-  disableDebugLogs(): Promise<void> {
-    return;
-  }
+  disableDebugLogs(): Promise<void> { return; }
 
   /**
    * Enables the posting of debug notifications in the native layer. Use this method if you want
@@ -740,9 +684,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer has set the flag to enabled.
    */
   @Cordova({ otherPromise: true })
-  enableDebugNotifications(): Promise<void> {
-    return;
-  }
+  enableDebugNotifications(): Promise<void> { return; }
 
   /**
    * Disables the posting of debug notifications in the native layer. Use this method if you want
@@ -752,9 +694,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer has set the flag to disabled.
    */
   @Cordova({ otherPromise: true })
-  disableDebugNotifications(): Promise<void> {
-    return;
-  }
+  disableDebugNotifications(): Promise<void> { return; }
 
   /**
    * Enables debug logging in the native layer. Use this method if you want
@@ -764,9 +704,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer has set the logging level accordingly.
    */
   @Cordova({ otherPromise: true })
-  enableDebugLogs(): Promise<void> {
-    return;
-  }
+  enableDebugLogs(): Promise<void> { return; }
 
   /**
    * Appends the provided [message] to the device logs.
@@ -779,7 +717,6 @@ export class IBeacon extends IonicNativePlugin {
    * is expected to be equivalent to the one provided in the original call.
    */
   @Cordova({ otherPromise: true })
-  appendToDeviceLog(message: string): Promise<void> {
-    return;
-  }
+  appendToDeviceLog(message: string): Promise<void> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/image-picker/index.ts b/src/@ionic-native/plugins/image-picker/index.ts
index ce56c3eed..02f265d23 100644
--- a/src/@ionic-native/plugins/image-picker/index.ts
+++ b/src/@ionic-native/plugins/image-picker/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 export interface ImagePickerOptions {
   /**
@@ -59,8 +60,7 @@ export interface ImagePickerOptions {
   plugin: 'cordova-plugin-telerik-imagepicker',
   pluginRef: 'window.imagePicker',
   repo: 'https://github.com/Telerik-Verified-Plugins/ImagePicker',
-  install:
-    'ionic cordova plugin add cordova-plugin-telerik-imagepicker --variable PHOTO_LIBRARY_USAGE_DESCRIPTION="your usage message"',
+  install: 'ionic cordova plugin add cordova-plugin-telerik-imagepicker --variable PHOTO_LIBRARY_USAGE_DESCRIPTION="your usage message"',
   installVariables: ['PHOTO_LIBRARY_USAGE_DESCRIPTION'],
   platforms: ['Android', 'iOS']
 })
@@ -75,9 +75,7 @@ export class ImagePicker extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getPictures(options: ImagePickerOptions): Promise<any> {
-    return;
-  }
+  getPictures(options: ImagePickerOptions): Promise<any> { return; }
 
   /**
    * Check if we have permission to read images
@@ -86,9 +84,7 @@ export class ImagePicker extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  hasReadPermission(): Promise<boolean> {
-    return;
-  }
+  hasReadPermission(): Promise<boolean> { return; }
 
   /**
    * Request permission to read images
@@ -97,7 +93,6 @@ export class ImagePicker extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  requestReadPermission(): Promise<any> {
-    return;
-  }
+  requestReadPermission(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/image-resizer/index.ts b/src/@ionic-native/plugins/image-resizer/index.ts
index 4231b73ae..2928e119c 100644
--- a/src/@ionic-native/plugins/image-resizer/index.ts
+++ b/src/@ionic-native/plugins/image-resizer/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface ImageResizerOptions {
   /**
@@ -80,7 +80,5 @@ export class ImageResizer extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  resize(options: ImageResizerOptions): Promise<any> {
-    return;
-  }
+  resize(options: ImageResizerOptions): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/in-app-browser/index.ts b/src/@ionic-native/plugins/in-app-browser/index.ts
index 33d7eafed..d4e0a1bfc 100644
--- a/src/@ionic-native/plugins/in-app-browser/index.ts
+++ b/src/@ionic-native/plugins/in-app-browser/index.ts
@@ -1,22 +1,15 @@
 import { Injectable } from '@angular/core';
-import {
-  CordovaInstance,
-  InstanceCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Plugin, CordovaInstance, InstanceCheck, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 
-declare const cordova: Cordova & { InAppBrowser: any };
+declare const cordova: Cordova & { InAppBrowser: any; };
 
 export interface InAppBrowserOptions {
   /** Set to yes or no to turn the InAppBrowser's location bar on or off. */
   location?: 'yes' | 'no';
-  /**
-   * Set to yes to create the browser and load the page, but not show it. The loadstop event fires when loading is complete.
-   * Omit or set to no (default) to have the browser open and load normally.
-   **/
+  /** Set to yes to create the browser and load the page, but not show it. The loadstop event fires when loading is complete.
+   * Omit or set to no (default) to have the browser open and load normally. */
   hidden?: 'yes' | 'no';
   /** Set to yes to have the browser's cookie cache cleared before the new window is opened. */
   clearcache?: 'yes';
@@ -24,10 +17,8 @@ export interface InAppBrowserOptions {
   clearsessioncache?: 'yes';
   /** (Android Only) set to yes to show Android browser's zoom controls, set to no to hide them. Default value is yes. */
   zoom?: 'yes' | 'no';
-  /**
-   * Set to yes to use the hardware back button to navigate backwards through the InAppBrowser's history.
-   * If there is no previous page, the InAppBrowser will close. The default value is yes, so you must set it to no if you want the back button to simply close the InAppBrowser.
-   **/
+  /** Set to yes to use the hardware back button to navigate backwards through the InAppBrowser's history.
+   * If there is no previous page, the InAppBrowser will close. The default value is yes, so you must set it to no if you want the back button to simply close the InAppBrowser. */
   hardwareback?: 'yes' | 'no';
   /** Set to yes to prevent HTML5 audio or video from autoplaying (defaults to no). */
   mediaPlaybackRequiresUserAction?: 'yes' | 'no';
@@ -54,10 +45,8 @@ export interface InAppBrowserOptions {
   transitionstyle?: 'fliphorizontal' | 'crossdissolve' | 'coververtical';
   /** (iOS Only) Set to top or bottom (default is bottom). Causes the toolbar to be at the top or bottom of the window. */
   toolbarposition?: 'top' | 'bottom';
-  /**
-   * (Windows only) Set to yes to create the browser control without a border around it.
-   * Please note that if location=no is also specified, there will be no control presented to user to close IAB window.
-   **/
+  /** (Windows only) Set to yes to create the browser control without a border around it.
+   * Please note that if location=no is also specified, there will be no control presented to user to close IAB window. */
   fullscreen?: 'yes';
 
   /**
@@ -80,6 +69,7 @@ export interface InAppBrowserEvent extends Event {
  * @hidden
  */
 export class InAppBrowserObject {
+
   private _objectInstance: any;
 
   /**
@@ -93,24 +83,20 @@ export class InAppBrowserObject {
    *                 The options string must not contain any blank space, and each feature's
    *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
    */
-  constructor(
-    url: string,
-    target?: string,
-    options?: string | InAppBrowserOptions
-  ) {
+  constructor(url: string, target?: string, options?: string | InAppBrowserOptions) {
     try {
+
       if (options && typeof options !== 'string') {
-        options = Object.keys(options)
-          .map((key: string) => `${key}=${(<InAppBrowserOptions>options)[key]}`)
-          .join(',');
+        options = Object.keys(options).map((key: string) => `${key}=${(<InAppBrowserOptions>options)[key]}`).join(',');
       }
 
       this._objectInstance = cordova.InAppBrowser.open(url, target, options);
+
     } catch (e) {
+
       window.open(url, target);
-      console.warn(
-        'Native: InAppBrowser is not installed or you are running on a browser. Falling back to window.open.'
-      );
+      console.warn('Native: InAppBrowser is not installed or you are running on a browser. Falling back to window.open.');
+
     }
   }
 
@@ -119,20 +105,20 @@ export class InAppBrowserObject {
    * if the InAppBrowser was already visible.
    */
   @CordovaInstance({ sync: true })
-  show(): void {}
+  show(): void { }
 
   /**
    * Closes the InAppBrowser window.
    */
   @CordovaInstance({ sync: true })
-  close(): void {}
+  close(): void { }
 
   /**
    * Hides an InAppBrowser window that is currently shown. Calling this has no effect
    * if the InAppBrowser was already hidden.
    */
   @CordovaInstance({ sync: true })
-  hide(): void {}
+  hide(): void { }
 
   /**
    * Injects JavaScript code into the InAppBrowser window.
@@ -140,9 +126,7 @@ export class InAppBrowserObject {
    * @returns {Promise<any>}
    */
   @CordovaInstance()
-  executeScript(script: { file?: string; code?: string }): Promise<any> {
-    return;
-  }
+  executeScript(script: { file?: string, code?: string }): Promise<any> { return; }
 
   /**
    * Injects CSS into the InAppBrowser window.
@@ -150,9 +134,7 @@ export class InAppBrowserObject {
    * @returns {Promise<any>}
    */
   @CordovaInstance()
-  insertCSS(css: { file?: string; code?: string }): Promise<any> {
-    return;
-  }
+  insertCSS(css: { file?: string, code?: string }): Promise<any> { return; }
 
   /**
    * A method that allows you to listen to events happening in the browser.
@@ -161,19 +143,10 @@ export class InAppBrowserObject {
    */
   @InstanceCheck()
   on(event: string): Observable<InAppBrowserEvent> {
-    return new Observable<InAppBrowserEvent>(
-      (observer: Observer<InAppBrowserEvent>) => {
-        this._objectInstance.addEventListener(
-          event,
-          observer.next.bind(observer)
-        );
-        return () =>
-          this._objectInstance.removeEventListener(
-            event,
-            observer.next.bind(observer)
-          );
-      }
-    );
+    return new Observable<InAppBrowserEvent>((observer: Observer<InAppBrowserEvent>) => {
+      this._objectInstance.addEventListener(event, observer.next.bind(observer));
+      return () => this._objectInstance.removeEventListener(event, observer.next.bind(observer));
+    });
   }
 }
 
@@ -212,6 +185,7 @@ export class InAppBrowserObject {
 })
 @Injectable()
 export class InAppBrowser extends IonicNativePlugin {
+
   /**
    * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
    * @param  url {string}     The URL to load.
@@ -221,11 +195,8 @@ export class InAppBrowser extends IonicNativePlugin {
    *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
    * @returns {InAppBrowserObject}
    */
-  create(
-    url: string,
-    target?: string,
-    options?: string | InAppBrowserOptions
-  ): InAppBrowserObject {
+  create(url: string, target?: string, options?: string | InAppBrowserOptions): InAppBrowserObject {
     return new InAppBrowserObject(url, target, options);
   }
+
 }
diff --git a/src/@ionic-native/plugins/in-app-purchase-2/index.ts b/src/@ionic-native/plugins/in-app-purchase-2/index.ts
index f0be289cc..46436d642 100644
--- a/src/@ionic-native/plugins/in-app-purchase-2/index.ts
+++ b/src/@ionic-native/plugins/in-app-purchase-2/index.ts
@@ -1,10 +1,5 @@
+import { Plugin, IonicNativePlugin, Cordova, CordovaProperty } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 
 /**
  * @name In App Purchase 2
@@ -86,22 +81,21 @@ export type IAPProducts = Array<IAPProduct> & {
   /**
    * Get product by ID
    */
-  byId: { [id: string]: IAPProduct };
+  byId: { [id: string]: IAPProduct; };
   /**
    * Get product by alias
    */
-  byAlias: { [alias: string]: IAPProduct };
+  byAlias: { [alias: string]: IAPProduct; };
   /**
    * Remove all products (for testing only).
    */
   reset: () => {};
 };
 
-export type IAPQueryCallback =
-  | ((product: IAPProduct) => void)
-  | ((error: IAPError) => void);
+export type IAPQueryCallback = ((product: IAPProduct) => void) | ((error: IAPError) => void);
 
 export interface IAPProduct {
+
   id: string;
 
   alias: string;
@@ -151,6 +145,7 @@ export interface IAPProduct {
   off(callback: Function): void;
 
   trigger(action: string, args: any): void;
+
 }
 
 export interface IAPProductEvents {
@@ -170,11 +165,7 @@ export interface IAPProductEvents {
   verified: (callback: IAPQueryCallback) => void;
   unverified: (callback: IAPQueryCallback) => void;
   expired: (callback: IAPQueryCallback) => void;
-  downloading: (
-    product: IAPProduct,
-    progress: any,
-    time_remaining: any
-  ) => void;
+  downloading: (product: IAPProduct, progress: any, time_remaining: any) => void;
   downloaded: (callback: IAPQueryCallback) => void;
 }
 
@@ -208,115 +199,163 @@ export class IAPError {
   pluginRef: 'store',
   repo: 'https://github.com/j3k0/cordova-plugin-purchase',
   platforms: ['iOS', 'Android', 'Windows'],
-  install:
-    'ionic cordova plugin add cc.fovea.cordova.purchase --variable BILLING_KEY="<ANDROID_BILLING_KEY>"'
+  install: 'ionic cordova plugin add cc.fovea.cordova.purchase --variable BILLING_KEY="<ANDROID_BILLING_KEY>"'
 })
 @Injectable()
 export class InAppPurchase2 extends IonicNativePlugin {
-  @CordovaProperty QUIET: number;
 
-  @CordovaProperty ERROR: number;
+  @CordovaProperty
+  QUIET: number;
 
-  @CordovaProperty WARNING: number;
+  @CordovaProperty
+  ERROR: number;
 
-  @CordovaProperty INFO: number;
+  @CordovaProperty
+  WARNING: number;
 
-  @CordovaProperty DEBUG: number;
+  @CordovaProperty
+  INFO: number;
+
+  @CordovaProperty
+  DEBUG: number;
 
   /**
    * Debug level. Use QUIET, ERROR, WARNING, INFO or DEBUG constants
    */
-  @CordovaProperty verbosity: number;
+  @CordovaProperty
+  verbosity: number;
 
   /**
    * Set to true to invoke the platform purchase sandbox. (Windows only)
    */
-  @CordovaProperty sandbox: boolean;
-
-  @CordovaProperty FREE_SUBSCRIPTION: string;
-
-  @CordovaProperty PAID_SUBSCRIPTION: string;
-
-  @CordovaProperty NON_RENEWING_SUBSCRIPTION: string;
-
-  @CordovaProperty CONSUMABLE: string;
-
-  @CordovaProperty NON_CONSUMABLE: string;
-
-  @CordovaProperty ERR_SETUP: number;
-
-  @CordovaProperty ERR_LOAD: number;
-
-  @CordovaProperty ERR_PURCHASE: number;
-
-  @CordovaProperty ERR_LOAD_RECEIPTS: number;
-
-  @CordovaProperty ERR_CLIENT_INVALID: number;
-
-  @CordovaProperty ERR_PAYMENT_CANCELLED: number;
-
-  @CordovaProperty ERR_PAYMENT_INVALID: number;
-
-  @CordovaProperty ERR_PAYMENT_NOT_ALLOWED: number;
-
-  @CordovaProperty ERR_UNKNOWN: number;
-
-  @CordovaProperty ERR_REFRESH_RECEIPTS: number;
-
-  @CordovaProperty ERR_INVALID_PRODUCT_ID: number;
-
-  @CordovaProperty ERR_FINISH: number;
-
-  @CordovaProperty ERR_COMMUNICATION: number;
-
-  @CordovaProperty ERR_SUBSCRIPTIONS_NOT_AVAILABLE: number;
-
-  @CordovaProperty ERR_MISSING_TOKEN: number;
-
-  @CordovaProperty ERR_VERIFICATION_FAILED: number;
-
-  @CordovaProperty ERR_BAD_RESPONSE: number;
-
-  @CordovaProperty ERR_REFRESH: number;
-
-  @CordovaProperty ERR_PAYMENT_EXPIRED: number;
-
-  @CordovaProperty ERR_DOWNLOAD: number;
-
-  @CordovaProperty ERR_SUBSCRIPTION_UPDATE_NOT_AVAILABLE: number;
-
-  @CordovaProperty REGISTERED: string;
-
-  @CordovaProperty INVALID: string;
-
-  @CordovaProperty VALID: string;
-
-  @CordovaProperty REQUESTED: string;
-
-  @CordovaProperty INITIATED: string;
-
-  @CordovaProperty APPROVED: string;
-
-  @CordovaProperty FINISHED: string;
-
-  @CordovaProperty OWNED: string;
-
-  @CordovaProperty DOWNLOADING: string;
-
-  @CordovaProperty DOWNLOADED: string;
-
-  @CordovaProperty INVALID_PAYLOAD: number;
-
-  @CordovaProperty CONNECTION_FAILED: number;
-
-  @CordovaProperty PURCHASE_EXPIRED: number;
-
-  @CordovaProperty products: IAPProducts;
+  @CordovaProperty
+  sandbox: boolean;
 
   @CordovaProperty
-  validator:
-    | string
-    | ((product: string | IAPProduct, callback: Function) => void);
+  FREE_SUBSCRIPTION: string;
+
+  @CordovaProperty
+  PAID_SUBSCRIPTION: string;
+
+  @CordovaProperty
+  NON_RENEWING_SUBSCRIPTION: string;
+
+  @CordovaProperty
+  CONSUMABLE: string;
+
+  @CordovaProperty
+  NON_CONSUMABLE: string;
+
+
+  @CordovaProperty
+  ERR_SETUP: number;
+
+  @CordovaProperty
+  ERR_LOAD: number;
+
+  @CordovaProperty
+  ERR_PURCHASE: number;
+
+  @CordovaProperty
+  ERR_LOAD_RECEIPTS: number;
+
+  @CordovaProperty
+  ERR_CLIENT_INVALID: number;
+
+  @CordovaProperty
+  ERR_PAYMENT_CANCELLED: number;
+
+  @CordovaProperty
+  ERR_PAYMENT_INVALID: number;
+
+  @CordovaProperty
+  ERR_PAYMENT_NOT_ALLOWED: number;
+
+  @CordovaProperty
+  ERR_UNKNOWN: number;
+
+  @CordovaProperty
+  ERR_REFRESH_RECEIPTS: number;
+
+  @CordovaProperty
+  ERR_INVALID_PRODUCT_ID: number;
+
+  @CordovaProperty
+  ERR_FINISH: number;
+
+  @CordovaProperty
+  ERR_COMMUNICATION: number;
+
+  @CordovaProperty
+  ERR_SUBSCRIPTIONS_NOT_AVAILABLE: number;
+
+  @CordovaProperty
+  ERR_MISSING_TOKEN: number;
+
+  @CordovaProperty
+  ERR_VERIFICATION_FAILED: number;
+
+  @CordovaProperty
+  ERR_BAD_RESPONSE: number;
+
+  @CordovaProperty
+  ERR_REFRESH: number;
+
+  @CordovaProperty
+  ERR_PAYMENT_EXPIRED: number;
+
+  @CordovaProperty
+  ERR_DOWNLOAD: number;
+
+  @CordovaProperty
+  ERR_SUBSCRIPTION_UPDATE_NOT_AVAILABLE: number;
+
+
+  @CordovaProperty
+  REGISTERED: string;
+
+  @CordovaProperty
+  INVALID: string;
+
+  @CordovaProperty
+  VALID: string;
+
+  @CordovaProperty
+  REQUESTED: string;
+
+  @CordovaProperty
+  INITIATED: string;
+
+  @CordovaProperty
+  APPROVED: string;
+
+  @CordovaProperty
+  FINISHED: string;
+
+  @CordovaProperty
+  OWNED: string;
+
+  @CordovaProperty
+  DOWNLOADING: string;
+
+  @CordovaProperty
+  DOWNLOADED: string;
+
+
+  @CordovaProperty
+  INVALID_PAYLOAD: number;
+
+  @CordovaProperty
+  CONNECTION_FAILED: number;
+
+  @CordovaProperty
+  PURCHASE_EXPIRED: number;
+
+  @CordovaProperty
+  products: IAPProducts;
+
+  @CordovaProperty
+  validator: string | ((product: string | IAPProduct, callback: Function) => void);
 
   @CordovaProperty
   log: {
@@ -331,9 +370,7 @@ export class InAppPurchase2 extends IonicNativePlugin {
    * @param idOrAlias
    */
   @Cordova({ sync: true })
-  get(idOrAlias: string): IAPProduct {
-    return;
-  }
+  get(idOrAlias: string): IAPProduct { return; }
 
   /**
    * Register error handler
@@ -346,7 +383,7 @@ export class InAppPurchase2 extends IonicNativePlugin {
    * Add or register a product
    * @param product {IAPProductOptions}
    */
-  @Cordova({ sync: true })
+  @Cordova({ sync: true})
   register(product: IAPProductOptions): void {}
 
   /**
@@ -357,13 +394,7 @@ export class InAppPurchase2 extends IonicNativePlugin {
    * @return {IAPProductEvents}
    */
   @Cordova({ sync: true })
-  when(
-    query: string | IAPProduct,
-    event?: string,
-    callback?: IAPQueryCallback
-  ): IAPProductEvents {
-    return;
-  }
+  when(query: string | IAPProduct, event?: string, callback?: IAPQueryCallback): IAPProductEvents { return; }
 
   /**
    * Identical to `when`, but the callback will be called only once. After being called, the callback will be unregistered.
@@ -373,13 +404,7 @@ export class InAppPurchase2 extends IonicNativePlugin {
    * @return {IAPProductEvents}
    */
   @Cordova({ sync: true })
-  once(
-    query: string | IAPProduct,
-    event?: string,
-    callback?: IAPQueryCallback
-  ): IAPProductEvents {
-    return;
-  }
+  once(query: string | IAPProduct, event?: string, callback?: IAPQueryCallback): IAPProductEvents { return; }
 
   /**
    * Unregister a callback. Works for callbacks registered with ready, when, once and error.
@@ -389,22 +414,16 @@ export class InAppPurchase2 extends IonicNativePlugin {
   off(callback: Function): void {}
 
   @Cordova({ sync: true })
-  order(
-    product: string | IAPProduct,
-    additionalData?: any
-  ): { then: Function; error: Function } {
-    return;
-  }
+  order(product: string | IAPProduct, additionalData?: any): { then: Function; error: Function; } { return; }
 
   /**
    *
    * @return {Promise<any>} returns a promise that resolves when the store is ready
    */
   @Cordova()
-  ready(): Promise<void> {
-    return;
-  }
+  ready(): Promise<void> { return; }
 
   @Cordova({ sync: true })
   refresh(): void {}
+
 }
diff --git a/src/@ionic-native/plugins/in-app-purchase/index.ts b/src/@ionic-native/plugins/in-app-purchase/index.ts
index 44bb8e970..4d59e18d9 100644
--- a/src/@ionic-native/plugins/in-app-purchase/index.ts
+++ b/src/@ionic-native/plugins/in-app-purchase/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name In App Purchase
@@ -61,6 +62,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class InAppPurchase extends IonicNativePlugin {
+
   /**
    * Retrieves a list of full product data from Apple/Google. This method must be called before making purchases.
    * @param {array<string>} productId an array of product ids.
@@ -69,9 +71,7 @@ export class InAppPurchase extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  getProducts(productId: string[]): Promise<any> {
-    return;
-  }
+  getProducts(productId: string[]): Promise<any> { return; }
 
   /**
    * Buy a product that matches the productId.
@@ -81,16 +81,7 @@ export class InAppPurchase extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  buy(
-    productId: string
-  ): Promise<{
-    transactionId: string;
-    receipt: string;
-    signature: string;
-    productType: string;
-  }> {
-    return;
-  }
+  buy(productId: string): Promise<{ transactionId: string, receipt: string, signature: string, productType: string }> { return; }
 
   /**
    * Same as buy, but for subscription based products.
@@ -100,16 +91,7 @@ export class InAppPurchase extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  subscribe(
-    productId: string
-  ): Promise<{
-    transactionId: string;
-    receipt: string;
-    signature: string;
-    productType: string;
-  }> {
-    return;
-  }
+  subscribe(productId: string): Promise<{ transactionId: string, receipt: string, signature: string, productType: string }> { return; }
 
   /**
    * Call this function after purchasing a "consumable" product to mark it as consumed. On Android, you must consume products that you want to let the user purchase multiple times. If you will not consume the product after a purchase, the next time you will attempt to purchase it you will get the error message:
@@ -121,13 +103,7 @@ export class InAppPurchase extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  consume(
-    productType: string,
-    receipt: string,
-    signature: string
-  ): Promise<any> {
-    return;
-  }
+  consume(productType: string, receipt: string, signature: string): Promise<any> { return; }
 
   /**
    * Restore all purchases from the store
@@ -136,9 +112,7 @@ export class InAppPurchase extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  restorePurchases(): Promise<any> {
-    return;
-  }
+  restorePurchases(): Promise<any> { return; }
 
   /**
    * Get the receipt.
@@ -148,7 +122,6 @@ export class InAppPurchase extends IonicNativePlugin {
     otherPromise: true,
     platforms: ['iOS']
   })
-  getReceipt(): Promise<string> {
-    return;
-  }
+  getReceipt(): Promise<string> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/insomnia/index.ts b/src/@ionic-native/plugins/insomnia/index.ts
index f31ec1392..1a541d321 100644
--- a/src/@ionic-native/plugins/insomnia/index.ts
+++ b/src/@ionic-native/plugins/insomnia/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name Insomnia
@@ -33,32 +34,23 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-insomnia',
   pluginRef: 'plugins.insomnia',
   repo: 'https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin',
-  platforms: [
-    'Android',
-    'Browser',
-    'Firefox OS',
-    'iOS',
-    'Windows',
-    'Windows Phone 8'
-  ]
+  platforms: ['Android', 'Browser', 'Firefox OS', 'iOS', 'Windows', 'Windows Phone 8']
 })
 @Injectable()
 export class Insomnia extends IonicNativePlugin {
+
   /**
    * Keeps awake the application
    * @returns {Promise<any>}
    */
   @Cordova()
-  keepAwake(): Promise<any> {
-    return;
-  }
+  keepAwake(): Promise<any> { return; }
 
   /**
    * Allows the application to sleep again
    * @returns {Promise<any>}
    */
   @Cordova()
-  allowSleepAgain(): Promise<any> {
-    return;
-  }
+  allowSleepAgain(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/instagram/index.ts b/src/@ionic-native/plugins/instagram/index.ts
index 309885294..fe9c5689c 100644
--- a/src/@ionic-native/plugins/instagram/index.ts
+++ b/src/@ionic-native/plugins/instagram/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Instagram
@@ -28,6 +28,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Instagram extends IonicNativePlugin {
+
   /**
    * Detect if the Instagram application is installed on the device.
    *
@@ -36,9 +37,7 @@ export class Instagram extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  isInstalled(): Promise<boolean | string> {
-    return;
-  }
+  isInstalled(): Promise<boolean | string> { return; }
 
   /**
    * Share an image on Instagram
@@ -51,9 +50,7 @@ export class Instagram extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  share(canvasIdOrDataUrl: string, caption?: string): Promise<any> {
-    return;
-  }
+  share(canvasIdOrDataUrl: string, caption?: string): Promise<any> { return; }
 
   /**
    * Share a library asset or video
@@ -63,7 +60,6 @@ export class Instagram extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  shareAsset(assetLocalIdentifier: string): Promise<any> {
-    return;
-  }
+  shareAsset(assetLocalIdentifier: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/intel-security/index.ts b/src/@ionic-native/plugins/intel-security/index.ts
index 1db1a4f0f..bdd30c46b 100644
--- a/src/@ionic-native/plugins/intel-security/index.ts
+++ b/src/@ionic-native/plugins/intel-security/index.ts
@@ -76,6 +76,7 @@ export interface IntelSecurityDataOptions {
 })
 @Injectable()
 export class IntelSecurity extends IonicNativePlugin {
+
   /**
    * returns an IntelSecurityStorage object
    * @type {IntelSecurityStorage}
@@ -87,6 +88,7 @@ export class IntelSecurity extends IonicNativePlugin {
    * @type {IntelSecurityData}
    */
   data: IntelSecurityData = new IntelSecurityData();
+
 }
 
 /**
@@ -98,15 +100,14 @@ export class IntelSecurity extends IonicNativePlugin {
   pluginRef: 'intel.security.secureData'
 })
 export class IntelSecurityData {
+
   /**
-   * This creates a new instance of secure data using plain-text data.
-   * @param options {IntelSecurityDataOptions}
-   * @returns {Promise<any>} Returns a Promise that resolves with the instanceID of the created data instance, or rejects with an error.
-   */
+  * This creates a new instance of secure data using plain-text data.
+  * @param options {IntelSecurityDataOptions}
+  * @returns {Promise<any>} Returns a Promise that resolves with the instanceID of the created data instance, or rejects with an error.
+  */
   @Cordova({ otherPromise: true })
-  createFromData(options: IntelSecurityDataOptions): Promise<Number> {
-    return;
-  }
+  createFromData(options: IntelSecurityDataOptions): Promise<Number> { return; }
 
   /**
    * This creates a new instance of secure data (using sealed data)
@@ -115,9 +116,7 @@ export class IntelSecurityData {
    * @returns {Promise<any>} Returns a Promise that resolves with the instanceID of the created data instance, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  createFromSealedData(options: { sealedData: string }): Promise<Number> {
-    return;
-  }
+  createFromSealedData(options: { sealedData: string }): Promise<Number> { return; }
 
   /**
    * This returns the plain-text data of the secure data instance.
@@ -125,9 +124,7 @@ export class IntelSecurityData {
    * @returns {Promise<string>} Returns a Promise that resolves to the data as plain-text, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getData(instanceID: Number): Promise<string> {
-    return;
-  }
+  getData(instanceID: Number): Promise<string> { return; }
 
   /**
    * This returns the sealed chunk of a secure data instance.
@@ -135,9 +132,7 @@ export class IntelSecurityData {
    * @returns {Promise<any>} Returns a Promise that resolves to the sealed data, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getSealedData(instanceID: any): Promise<any> {
-    return;
-  }
+  getSealedData(instanceID: any): Promise<any> { return; }
 
   /**
    * This returns the tag of the secure data instance.
@@ -145,9 +140,7 @@ export class IntelSecurityData {
    * @returns {Promise<string>} Returns a Promise that resolves to the tag, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getTag(instanceID: any): Promise<string> {
-    return;
-  }
+  getTag(instanceID: any): Promise<string> { return; }
 
   /**
    * This returns the data policy of the secure data instance.
@@ -155,9 +148,7 @@ export class IntelSecurityData {
    * @returns {Promise<any>} Returns a promise that resolves to the policy object, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getPolicy(instanceID: any): Promise<any> {
-    return;
-  }
+  getPolicy(instanceID: any): Promise<any> { return; }
 
   /**
    * This returns an array of the data owners unique IDs.
@@ -165,9 +156,7 @@ export class IntelSecurityData {
    * @returns {Promise<Array>} Returns a promise that resolves to an array of owners' unique IDs, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getOwners(instanceID: any): Promise<Array<any>> {
-    return;
-  }
+  getOwners(instanceID: any): Promise<Array<any>> { return; }
 
   /**
    * This returns the data creator unique ID.
@@ -175,9 +164,7 @@ export class IntelSecurityData {
    * @returns {Promise<Number>} Returns a promsie that resolves to the creator's unique ID, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getCreator(instanceID: any): Promise<Number> {
-    return;
-  }
+  getCreator(instanceID: any): Promise<Number> { return; }
 
   /**
    * This returns an array of the trusted web domains of the secure data instance.
@@ -185,9 +172,7 @@ export class IntelSecurityData {
    * @returns {Promise<Array>} Returns a promise that resolves to a list of web owners, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getWebOwners(instanceID: any): Promise<Array<any>> {
-    return;
-  }
+  getWebOwners(instanceID: any): Promise<Array<any>> { return; }
 
   /**
    * This changes the extra key of a secure data instance. To successfully replace the extra key, the calling application must have sufficient access to the plain-text data.
@@ -197,9 +182,7 @@ export class IntelSecurityData {
    * @returns {Promise<any>} Returns a promise that resolves with no parameters, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  changeExtraKey(options: any): Promise<any> {
-    return;
-  }
+  changeExtraKey(options: any): Promise<any> { return; }
 
   /**
    * This releases a secure data instance.
@@ -207,9 +190,8 @@ export class IntelSecurityData {
    * @returns {Promise<any>} Returns a promise that resovles with no parameters, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  destroy(instanceID: any): Promise<any> {
-    return;
-  }
+  destroy(instanceID: any): Promise<any> { return; }
+
 }
 
 /**
@@ -221,6 +203,7 @@ export class IntelSecurityData {
   pluginRef: 'intel.security.secureStorage'
 })
 export class IntelSecurityStorage {
+
   /**
    * This deletes a secure storage resource (indicated by id).
    * @param options {Object}
@@ -229,9 +212,10 @@ export class IntelSecurityStorage {
    * @returns {Promise<any>} Returns a Promise that resolves with no parameters, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  delete(options: { id: string; storageType?: Number }): Promise<any> {
-    return;
-  }
+  delete(options: {
+    id: string,
+    storageType?: Number
+  }): Promise<any> { return; }
 
   /**
    * This reads the data from secure storage (indicated by id) and creates a new secure data instance.
@@ -243,12 +227,10 @@ export class IntelSecurityStorage {
    */
   @Cordova({ otherPromise: true })
   read(options: {
-    id: string;
-    storageType?: Number;
-    extraKey?: Number;
-  }): Promise<Number> {
-    return;
-  }
+    id: string,
+    storageType?: Number,
+    extraKey?: Number
+  }): Promise<Number> { return; }
 
   /**
    * This writes the data contained in a secure data instance into secure storage.
@@ -260,10 +242,9 @@ export class IntelSecurityStorage {
    */
   @Cordova({ otherPromise: true })
   write(options: {
-    id: String;
-    instanceID: Number;
-    storageType?: Number;
-  }): Promise<any> {
-    return;
-  }
+    id: String,
+    instanceID: Number,
+    storageType?: Number
+  }): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/intercom/index.ts b/src/@ionic-native/plugins/intercom/index.ts
index ea65fc5d1..8d6c4dcc0 100644
--- a/src/@ionic-native/plugins/intercom/index.ts
+++ b/src/@ionic-native/plugins/intercom/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Intercom
@@ -27,19 +27,18 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-intercom',
   pluginRef: 'intercom',
   repo: 'https://github.com/intercom/intercom-cordova',
-  platforms: ['Android', 'iOS']
+  platforms: ['Android', 'iOS'],
 })
 @Injectable()
 export class Intercom extends IonicNativePlugin {
+
   /**
    * Register a identified user
    * @param options {any} Options
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  registerIdentifiedUser(options: any): Promise<any> {
-    return;
-  }
+  registerIdentifiedUser(options: any): Promise<any> { return; }
 
   /**
    * Register a unidentified user
@@ -47,18 +46,14 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  registerUnidentifiedUser(options: any): Promise<any> {
-    return;
-  }
+  registerUnidentifiedUser(options: any): Promise<any> { return; }
 
   /**
    * This resets the Intercom integration's cache of your user's identity and wipes the slate clean.
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  reset(): Promise<any> {
-    return;
-  }
+  reset(): Promise<any> { return; }
 
   /**
    *
@@ -67,9 +62,7 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  setSecureMode(secureHash: string, secureData: any): Promise<any> {
-    return;
-  }
+  setSecureMode(secureHash: string, secureData: any): Promise<any> { return; }
 
   /**
    *
@@ -77,9 +70,7 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  setUserHash(secureHash: string): Promise<any> {
-    return;
-  }
+  setUserHash(secureHash: string): Promise<any> { return; }
 
   /**
    *
@@ -87,9 +78,7 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  updateUser(attributes: any): Promise<any> {
-    return;
-  }
+  updateUser(attributes: any): Promise<any> { return; }
 
   /**
    *
@@ -98,27 +87,21 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  logEvent(eventName: string, metaData: any): Promise<any> {
-    return;
-  }
+  logEvent(eventName: string, metaData: any): Promise<any> { return; }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  displayMessenger(): Promise<any> {
-    return;
-  }
+  displayMessenger(): Promise<any> { return; }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  displayMessageComposer(): Promise<any> {
-    return;
-  }
+  displayMessageComposer(): Promise<any> { return; }
 
   /**
    *
@@ -126,29 +109,21 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  displayMessageComposerWithInitialMessage(
-    initialMessage: string
-  ): Promise<any> {
-    return;
-  }
+  displayMessageComposerWithInitialMessage(initialMessage: string): Promise<any> { return; }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  displayConversationsList(): Promise<any> {
-    return;
-  }
+  displayConversationsList(): Promise<any> { return; }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  unreadConversationCount(): Promise<any> {
-    return;
-  }
+  unreadConversationCount(): Promise<any> { return; }
 
   /**
    *
@@ -156,9 +131,7 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  setLauncherVisibility(visibility: string): Promise<any> {
-    return;
-  }
+  setLauncherVisibility(visibility: string): Promise<any> { return; }
 
   /**
    *
@@ -166,25 +139,20 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  setInAppMessageVisibility(visibility: string): Promise<any> {
-    return;
-  }
+  setInAppMessageVisibility(visibility: string): Promise<any> { return; }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  hideMessenger(): Promise<any> {
-    return;
-  }
+  hideMessenger(): Promise<any> { return; }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  registerForPush(): Promise<any> {
-    return;
-  }
+  registerForPush(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/jins-meme/index.ts b/src/@ionic-native/plugins/jins-meme/index.ts
index 8953fc24d..282e6a312 100644
--- a/src/@ionic-native/plugins/jins-meme/index.ts
+++ b/src/@ionic-native/plugins/jins-meme/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Plugin, Cordova, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare const cordova: any;
@@ -54,9 +49,7 @@ export class JinsMeme extends IonicNativePlugin {
    *@returns {Promise<any>}
    */
   @Cordova()
-  setAppClientID(appClientId: string, clientSecret: string): Promise<any> {
-    return;
-  }
+  setAppClientID(appClientId: string, clientSecret: string): Promise<any> { return; }
   /**
    * Starts scanning for JINS MEME.
    * @returns {Observable<any>}
@@ -66,17 +59,13 @@ export class JinsMeme extends IonicNativePlugin {
     clearFunction: 'stopScan',
     clearWithArgs: true
   })
-  startScan(): Observable<any> {
-    return;
-  }
+  startScan(): Observable<any> { return; }
   /**
    * Stops scanning JINS MEME.
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopScan(): Promise<any> {
-    return;
-  }
+  stopScan(): Promise<any> { return; }
   /**
    * Establishes connection to JINS MEME.
    * @param {string} target
@@ -87,12 +76,7 @@ export class JinsMeme extends IonicNativePlugin {
   })
   connect(target: string): Observable<any> {
     return new Observable<any>((observer: any) => {
-      let data = cordova.plugins.JinsMemePlugin.connect(
-        target,
-        observer.next.bind(observer),
-        observer.complete.bind(observer),
-        observer.error.bind(observer)
-      );
+      let data = cordova.plugins.JinsMemePlugin.connect(target, observer.next.bind(observer), observer.complete.bind(observer), observer.error.bind(observer));
       return () => console.log(data);
     });
   }
@@ -102,25 +86,19 @@ export class JinsMeme extends IonicNativePlugin {
    *@returns {Promise<any>}
    */
   @Cordova()
-  setAutoConnect(flag: boolean): Promise<any> {
-    return;
-  }
+  setAutoConnect(flag: boolean): Promise<any> { return; }
   /**
    * Returns whether a connection to JINS MEME has been established.
    *@returns {Promise<any>}
    */
   @Cordova()
-  isConnected(): Promise<any> {
-    return;
-  }
+  isConnected(): Promise<any> { return; }
   /**
    * Disconnects from JINS MEME.
    *@returns {Promise<any>}
    */
   @Cordova()
-  disconnect(): Promise<any> {
-    return;
-  }
+  disconnect(): Promise<any> { return; }
   /**
    * Starts receiving realtime data.
    * @returns {Observable<any>}
@@ -130,80 +108,60 @@ export class JinsMeme extends IonicNativePlugin {
     clearFunction: 'stopDataReport',
     clearWithArgs: true
   })
-  startDataReport(): Observable<any> {
-    return;
-  }
+  startDataReport(): Observable<any> { return; }
   /**
-   * Stops receiving data.
-   *@returns {Promise<any>}
-   */
+  * Stops receiving data.
+  *@returns {Promise<any>}
+  */
   @Cordova()
-  stopDataReport(): Promise<any> {
-    return;
-  }
+  stopDataReport(): Promise<any> { return; }
   /**
    * Returns SDK version.
    *
    *@returns {Promise<any>}
    */
   @Cordova()
-  getSDKVersion(): Promise<any> {
-    return;
-  }
+  getSDKVersion(): Promise<any> { return; }
   /**
    * Returns JINS MEME connected with other apps.
    *@returns {Promise<any>}
    */
   @Cordova()
-  getConnectedByOthers(): Promise<any> {
-    return;
-  }
+  getConnectedByOthers(): Promise<any> { return; }
   /**
    * Returns calibration status
    *@returns {Promise<any>}
    */
   @Cordova()
-  isCalibrated(): Promise<any> {
-    return;
-  }
+  isCalibrated(): Promise<any> { return; }
   /**
    * Returns device type.
    *@returns {Promise<any>}
    */
   @Cordova()
-  getConnectedDeviceType(): Promise<any> {
-    return;
-  }
+  getConnectedDeviceType(): Promise<any> { return; }
   /**
    * Returns hardware version.
    *@returns {Promise<any>}
    */
   @Cordova()
-  getConnectedDeviceSubType(): Promise<any> {
-    return;
-  }
+  getConnectedDeviceSubType(): Promise<any> { return; }
   /**
    * Returns FW Version.
    *@returns {Promise<any>}
    */
   @Cordova()
-  getFWVersion(): Promise<any> {
-    return;
-  }
+  getFWVersion(): Promise<any> { return; }
   /**
    * Returns HW Version.
    *@returns {Promise<any>}
    */
   @Cordova()
-  getHWVersion(): Promise<any> {
-    return;
-  }
+  getHWVersion(): Promise<any> { return; }
   /**
    * Returns response about whether data was received or not.
    *@returns {Promise<any>}
    */
   @Cordova()
-  isDataReceiving(): Promise<any> {
-    return;
-  }
+  isDataReceiving(): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/keyboard/index.ts b/src/@ionic-native/plugins/keyboard/index.ts
index 3d137eff8..f79a25e9c 100644
--- a/src/@ionic-native/plugins/keyboard/index.ts
+++ b/src/@ionic-native/plugins/keyboard/index.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
+
 /**
  * @name Keyboard
  * @description
@@ -28,12 +29,13 @@ import { Observable } from 'rxjs/Observable';
 })
 @Injectable()
 export class Keyboard extends IonicNativePlugin {
+
   /**
    * Hide the keyboard accessory bar with the next, previous and done buttons.
    * @param hide {boolean}
    */
   @Cordova({ sync: true })
-  hideKeyboardAccessoryBar(hide: boolean): void {}
+  hideKeyboardAccessoryBar(hide: boolean): void { }
 
   /**
    * Force keyboard to be shown.
@@ -42,7 +44,7 @@ export class Keyboard extends IonicNativePlugin {
     sync: true,
     platforms: ['Android', 'BlackBerry 10', 'Windows']
   })
-  show(): void {}
+  show(): void { }
 
   /**
    * Close the keyboard if open.
@@ -51,7 +53,7 @@ export class Keyboard extends IonicNativePlugin {
     sync: true,
     platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
   })
-  close(): void {}
+  close(): void { }
 
   /**
    * Prevents the native UIScrollView from moving when an input is focused.
@@ -61,7 +63,7 @@ export class Keyboard extends IonicNativePlugin {
     sync: true,
     platforms: ['iOS', 'Windows']
   })
-  disableScroll(disable: boolean): void {}
+  disableScroll(disable: boolean): void { }
 
   /**
    * Creates an observable that notifies you when the keyboard is shown. Unsubscribe to observable to cancel event watch.
@@ -72,9 +74,7 @@ export class Keyboard extends IonicNativePlugin {
     event: 'native.keyboardshow',
     platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
   })
-  onKeyboardShow(): Observable<any> {
-    return;
-  }
+  onKeyboardShow(): Observable<any> { return; }
 
   /**
    * Creates an observable that notifies you when the keyboard is hidden. Unsubscribe to observable to cancel event watch.
@@ -85,7 +85,6 @@ export class Keyboard extends IonicNativePlugin {
     event: 'native.keyboardhide',
     platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
   })
-  onKeyboardHide(): Observable<any> {
-    return;
-  }
+  onKeyboardHide(): Observable<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/keychain-touch-id/index.ts b/src/@ionic-native/plugins/keychain-touch-id/index.ts
index f31c49215..4f128469e 100644
--- a/src/@ionic-native/plugins/keychain-touch-id/index.ts
+++ b/src/@ionic-native/plugins/keychain-touch-id/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Keychain Touch Id
@@ -32,6 +32,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class KeychainTouchId extends IonicNativePlugin {
+
   /**
    * Check if Touch ID / Fingerprint is supported by the device
    * @return {Promise<any>} Returns a promise that resolves when there is hardware support
@@ -49,9 +50,7 @@ export class KeychainTouchId extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when there is a result
    */
   @Cordova()
-  save(key: string, password: string): Promise<any> {
-    return;
-  }
+  save(key: string, password: string): Promise<any> { return; }
 
   /**
    * Opens the fingerprint dialog, for the given key, showing an additional message. Promise will resolve
@@ -61,9 +60,7 @@ export class KeychainTouchId extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when the key value is successfully retrieved or an error
    */
   @Cordova()
-  verify(key: string, message: string): Promise<any> {
-    return;
-  }
+  verify(key: string, message: string): Promise<any> { return; }
 
   /**
    * Checks if there is a password stored within the keychain for the given key.
@@ -71,9 +68,7 @@ export class KeychainTouchId extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves with success if the key is available or failure if key is not.
    */
   @Cordova()
-  has(key: string): Promise<any> {
-    return;
-  }
+  has(key: string): Promise<any> { return; }
 
   /**
    * Deletes the password stored under given key from the keychain.
@@ -81,9 +76,7 @@ export class KeychainTouchId extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves with success if the key is deleted or failure if key is not
    */
   @Cordova()
-  delete(key: string): Promise<any> {
-    return;
-  }
+  delete(key: string): Promise<any> { return; }
 
   /**
    * Sets the language of the fingerprint dialog
@@ -91,4 +84,5 @@ export class KeychainTouchId extends IonicNativePlugin {
    */
   @Cordova()
   setLocale(locale: string): void {}
+
 }
diff --git a/src/@ionic-native/plugins/keychain/index.ts b/src/@ionic-native/plugins/keychain/index.ts
index 63bdd30e5..20381d70e 100644
--- a/src/@ionic-native/plugins/keychain/index.ts
+++ b/src/@ionic-native/plugins/keychain/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name Keychain
@@ -35,6 +36,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Keychain extends IonicNativePlugin {
+
   /**
    * Retrieves a value for a key
    *
@@ -44,9 +46,7 @@ export class Keychain extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  get(key: string, touchIDMessage?: string): Promise<any> {
-    return;
-  }
+  get(key: string, touchIDMessage?: string): Promise<any> { return; }
 
   /**
    * Sets a value for a key
@@ -58,13 +58,7 @@ export class Keychain extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  set(
-    key: string,
-    value: string | number | boolean,
-    useTouchID?: boolean
-  ): Promise<any> {
-    return;
-  }
+  set(key: string, value: string | number | boolean, useTouchID?: boolean): Promise<any> { return; }
 
   /**
    * Gets a JSON value for a key
@@ -75,9 +69,7 @@ export class Keychain extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getJson(key: string, touchIDMessage?: string): Promise<any> {
-    return;
-  }
+  getJson(key: string, touchIDMessage?: string): Promise<any> { return; }
 
   /**
    * Sets a JSON value for a key
@@ -89,9 +81,7 @@ export class Keychain extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  setJson(key: string, obj: any, useTouchId?: boolean): Promise<any> {
-    return;
-  }
+  setJson(key: string, obj: any, useTouchId?: boolean): Promise<any> { return; }
 
   /**
    * Removes a value for a key
@@ -101,7 +91,6 @@ export class Keychain extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  remove(key: string): Promise<any> {
-    return;
-  }
+  remove(key: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/launch-navigator/index.ts b/src/@ionic-native/plugins/launch-navigator/index.ts
index a7dc52275..79140e26f 100644
--- a/src/@ionic-native/plugins/launch-navigator/index.ts
+++ b/src/@ionic-native/plugins/launch-navigator/index.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface PromptsOptions {
+
   /**
    * a function to pass the user's decision whether to remember their choice of app.
    * This will be passed a single boolean value indicating the user's decision.
@@ -21,6 +22,7 @@ export interface PromptsOptions {
    */
   bodyText?: string;
 
+
   /**
    * text to display for the Yes button.
    * Defaults to "Yes" if not specified.
@@ -35,6 +37,7 @@ export interface PromptsOptions {
 }
 
 export interface RememberChoiceOptions {
+
   /**
    * whether to remember user choice of app for next time, instead of asking again for user choice.
    * `"prompt"` - Prompt user to decide whether to remember choice.
@@ -46,6 +49,7 @@ export interface RememberChoiceOptions {
    */
   enabled?: boolean | string;
 
+
   /**
    * a function which asks the user whether to remember their choice of app.
    * If this is defined, then the default dialog prompt will not be shown, allowing for a custom UI for asking the user.
@@ -99,6 +103,7 @@ export interface AppSelectionOptions {
 }
 
 export interface LaunchNavigatorOptions {
+
   /**
    * A callback to invoke when the navigation app is successfully launched.
    */
@@ -167,6 +172,7 @@ export interface LaunchNavigatorOptions {
    */
   launchModeAppleMaps?: string;
 
+
   /**
    * If true, and input location type(s) doesn't match those required by the app, use geocoding to obtain the address/coords as required. Defaults to true.
    */
@@ -179,6 +185,7 @@ export interface LaunchNavigatorOptions {
 }
 
 export interface UserChoice {
+
   /**
    * Indicates whether a user choice exists for a preferred navigator app.
    * @param callback - function to pass result to: will receive a boolean argument.
@@ -216,13 +223,13 @@ export interface UserPrompted {
    * Sets flag indicating user has already been prompted whether to remember their choice a preferred navigator app.
    * @param callback - function to call once operation is complete.
    */
-  set: (callback: () => void) => void;
+  set: ( callback: () => void) => void;
 
   /**
    * Clears flag which indicates if user has already been prompted whether to remember their choice a preferred navigator app.
    * @param callback - function to call once operation is complete.
    */
-  clear: (callback: () => void) => void;
+  clear: ( callback: () => void) => void;
 }
 
 export interface AppSelection {
@@ -274,6 +281,7 @@ export interface AppSelection {
 })
 @Injectable()
 export class LaunchNavigator extends IonicNativePlugin {
+
   APP: any = {
     USER_SELECT: 'user_select',
     APPLE_MAPS: 'apple_maps',
@@ -308,12 +316,7 @@ export class LaunchNavigator extends IonicNativePlugin {
     successIndex: 2,
     errorIndex: 3
   })
-  navigate(
-    destination: string | number[],
-    options?: LaunchNavigatorOptions
-  ): Promise<any> {
-    return;
-  }
+  navigate(destination: string | number[], options?: LaunchNavigatorOptions): Promise<any> { return; }
 
   /**
    * Determines if the given app is installed and available on the current device.
@@ -321,18 +324,14 @@ export class LaunchNavigator extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isAppAvailable(app: string): Promise<any> {
-    return;
-  }
+  isAppAvailable(app: string): Promise<any> { return; }
 
   /**
    * Returns a list indicating which apps are installed and available on the current device.
    * @returns {Promise<string[]>}
    */
   @Cordova()
-  availableApps(): Promise<string[]> {
-    return;
-  }
+  availableApps(): Promise<string[]> { return; }
 
   /**
    * Returns the display name of the specified app.
@@ -340,9 +339,7 @@ export class LaunchNavigator extends IonicNativePlugin {
    * @returns {string}
    */
   @Cordova({ sync: true })
-  getAppDisplayName(app: string): string {
-    return;
-  }
+  getAppDisplayName(app: string): string { return; }
 
   /**
    * Returns list of supported apps on a given platform.
@@ -350,9 +347,7 @@ export class LaunchNavigator extends IonicNativePlugin {
    * @returns {string[]}
    */
   @Cordova({ sync: true })
-  getAppsForPlatform(platform: string): string[] {
-    return;
-  }
+  getAppsForPlatform(platform: string): string[] { return; }
 
   /**
    * Indicates if an app on a given platform supports specification of transport mode.
@@ -361,9 +356,7 @@ export class LaunchNavigator extends IonicNativePlugin {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  supportsTransportMode(app: string, platform: string): boolean {
-    return;
-  }
+  supportsTransportMode(app: string, platform: string): boolean { return; }
 
   /**
    * Returns the list of transport modes supported by an app on a given platform.
@@ -372,9 +365,7 @@ export class LaunchNavigator extends IonicNativePlugin {
    * @returns {string[]}
    */
   @Cordova({ sync: true })
-  getTransportModes(app: string, platform: string): string[] {
-    return;
-  }
+  getTransportModes(app: string, platform: string): string[] { return; }
 
   /**
    * @param app {string}
@@ -382,9 +373,7 @@ export class LaunchNavigator extends IonicNativePlugin {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  supportsDestName(app: string, platform: string): boolean {
-    return;
-  }
+  supportsDestName(app: string, platform: string): boolean { return; }
 
   /**
    * Indicates if an app on a given platform supports specification of start location.
@@ -393,9 +382,7 @@ export class LaunchNavigator extends IonicNativePlugin {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  supportsStart(app: string, platform: string): boolean {
-    return;
-  }
+  supportsStart(app: string, platform: string): boolean { return; }
 
   /**
    * @param app {string}
@@ -403,9 +390,7 @@ export class LaunchNavigator extends IonicNativePlugin {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  supportsStartName(app: string, platform: string): boolean {
-    return;
-  }
+  supportsStartName(app: string, platform: string): boolean { return; }
 
   /**
    * Indicates if an app on a given platform supports specification of launch mode.
@@ -415,19 +400,14 @@ export class LaunchNavigator extends IonicNativePlugin {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  supportsLaunchMode(app: string, platform: string): boolean {
-    return;
-  }
+  supportsLaunchMode(app: string, platform: string): boolean { return; }
 
   /**
    * @param destination {string | number[]}
    * @param options {LaunchNavigatorOptions}
    */
   @Cordova({ sync: true })
-  userSelect(
-    destination: string | number[],
-    options: LaunchNavigatorOptions
-  ): void {}
+  userSelect(destination: string | number[], options: LaunchNavigatorOptions): void {}
 
   appSelection: AppSelection;
 }
diff --git a/src/@ionic-native/plugins/launch-review/index.ts b/src/@ionic-native/plugins/launch-review/index.ts
index 38aad44f0..86c3c038a 100644
--- a/src/@ionic-native/plugins/launch-review/index.ts
+++ b/src/@ionic-native/plugins/launch-review/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Launch Review
@@ -35,6 +35,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class LaunchReview extends IonicNativePlugin {
+
   /**
    * Launches App Store on current platform in order to leave a review for given app.
    * @param appId {string} - (optional) the platform-specific app ID to use to open the page in the store app.
@@ -44,9 +45,7 @@ export class LaunchReview extends IonicNativePlugin {
    * @returns {Promise<void>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  launch(appId?: string): Promise<void> {
-    return;
-  }
+  launch(appId?: string): Promise<void> { return; }
 
   /**
    * Invokes the native in-app rating dialog which allows a user to rate your app without needing to open the App Store.
@@ -58,9 +57,7 @@ export class LaunchReview extends IonicNativePlugin {
    * @returns {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  rating(): Promise<string> {
-    return;
-  }
+  rating(): Promise<string> { return; }
 
   /**
    * Indicates if the current platform/version supports in-app ratings dialog, i.e. calling LaunchReview.rating().
@@ -68,7 +65,6 @@ export class LaunchReview extends IonicNativePlugin {
    * @returns {boolean}
    */
   @Cordova({ platforms: ['Android', 'iOS'], sync: true })
-  isRatingSupported(): boolean {
-    return;
-  }
+  isRatingSupported(): boolean { return; }
+
 }
diff --git a/src/@ionic-native/plugins/linkedin/index.ts b/src/@ionic-native/plugins/linkedin/index.ts
index fd263ebed..f93b42497 100644
--- a/src/@ionic-native/plugins/linkedin/index.ts
+++ b/src/@ionic-native/plugins/linkedin/index.ts
@@ -1,11 +1,7 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
-export type LinkedInLoginScopes =
-  | 'r_basicprofile'
-  | 'r_emailaddress'
-  | 'rw_company_admin'
-  | 'w_share';
+export type LinkedInLoginScopes = 'r_basicprofile' | 'r_emailaddress' | 'rw_company_admin' | 'w_share';
 
 /**
  * @name LinkedIn
@@ -57,13 +53,13 @@ export type LinkedInLoginScopes =
   plugin: 'cordova-plugin-linkedin',
   pluginRef: 'cordova.plugins.LinkedIn',
   repo: 'https://github.com/zyra/cordova-plugin-linkedin',
-  install:
-    'ionic cordova plugin add cordova-plugin-linkedin --variable APP_ID=YOUR_APP_ID',
+  install: 'ionic cordova plugin add cordova-plugin-linkedin --variable APP_ID=YOUR_APP_ID',
   installVariables: ['APP_ID'],
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class LinkedIn extends IonicNativePlugin {
+
   /**
    * Login with the LinkedIn App
    * @param scopes {string[]} Scopes to authorize
@@ -71,15 +67,13 @@ export class LinkedIn extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  login(scopes: LinkedInLoginScopes[], promptToInstall: boolean): Promise<any> {
-    return;
-  }
+  login(scopes: LinkedInLoginScopes[], promptToInstall: boolean): Promise<any> { return; }
 
   /**
    * Clears the current session
    */
   @Cordova({ sync: true })
-  logout(): void {}
+  logout(): void { }
 
   /**
    * Make a get request
@@ -87,9 +81,7 @@ export class LinkedIn extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  getRequest(path: string): Promise<any> {
-    return;
-  }
+  getRequest(path: string): Promise<any> { return; }
 
   /**
    * Make a post request
@@ -98,9 +90,7 @@ export class LinkedIn extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  postRequest(path: string, body: any): Promise<any> {
-    return;
-  }
+  postRequest(path: string, body: any): Promise<any> { return; }
 
   /**
    * Opens a member's profile
@@ -108,25 +98,20 @@ export class LinkedIn extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  openProfile(memberId: string): Promise<any> {
-    return;
-  }
+  openProfile(memberId: string): Promise<any> { return; }
 
   /**
    * Checks if there is already an existing active session. This should be used to avoid unnecessary login.
    * @return {Promise<boolean>} returns a promise that resolves with a boolean that indicates whether there is an active session
    */
   @Cordova()
-  hasActiveSession(): Promise<boolean> {
-    return;
-  }
+  hasActiveSession(): Promise<boolean> { return; }
 
   /**
    * Checks if there is an active session and returns the access token if it exists.
    * @return {Promise<any>} returns a promise that resolves with an object that contains an access token if there is an active session
    */
   @Cordova()
-  getActiveSession(): Promise<any> {
-    return;
-  }
+  getActiveSession(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/local-notifications/index.ts b/src/@ionic-native/plugins/local-notifications/index.ts
index 09f167a62..74dd1e6bf 100644
--- a/src/@ionic-native/plugins/local-notifications/index.ts
+++ b/src/@ionic-native/plugins/local-notifications/index.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface ILocalNotification {
+
   /**
    * A unique identifier required to clear, cancel, update or retrieve the local notification in the future
    * Default: 0
@@ -66,12 +67,13 @@ export interface ILocalNotification {
   smallIcon?: string;
 
   /**
-   * ANDROID ONLY
-   * RGB value for the background color of the smallIcon.
-   * Default: Androids COLOR_DEFAULT, which will vary based on Android version.
-   */
+  * ANDROID ONLY
+  * RGB value for the background color of the smallIcon.
+  * Default: Androids COLOR_DEFAULT, which will vary based on Android version.
+  */
   color?: string;
 
+
   /**
    * ANDROID ONLY
    * Ongoing notifications differ from regular notifications in the following ways:
@@ -89,8 +91,8 @@ export interface ILocalNotification {
   led?: string;
 
   /**
-   * Notification priority.
-   */
+  * Notification priority.
+  */
   priority?: number;
 }
 
@@ -152,6 +154,7 @@ export interface ILocalNotification {
 })
 @Injectable()
 export class LocalNotifications extends IonicNativePlugin {
+
   /**
    * Schedules a single or multiple notifications
    * @param options {Notification | Array<ILocalNotification>} optional
@@ -159,7 +162,7 @@ export class LocalNotifications extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  schedule(options?: ILocalNotification | Array<ILocalNotification>): void {}
+  schedule(options?: ILocalNotification | Array<ILocalNotification>): void { }
 
   /**
    * Updates a previously scheduled notification. Must include the id in the options parameter.
@@ -168,7 +171,7 @@ export class LocalNotifications extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  update(options?: ILocalNotification): void {}
+  update(options?: ILocalNotification): void { }
 
   /**
    * Clears single or multiple notifications
@@ -176,9 +179,7 @@ export class LocalNotifications extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a promise when the notification had been cleared
    */
   @Cordova()
-  clear(notificationId: any): Promise<any> {
-    return;
-  }
+  clear(notificationId: any): Promise<any> { return; }
 
   /**
    * Clears all notifications
@@ -188,9 +189,7 @@ export class LocalNotifications extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 2
   })
-  clearAll(): Promise<any> {
-    return;
-  }
+  clearAll(): Promise<any> { return; }
 
   /**
    * Cancels single or multiple notifications
@@ -198,9 +197,7 @@ export class LocalNotifications extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a promise when the notification is canceled
    */
   @Cordova()
-  cancel(notificationId: any): Promise<any> {
-    return;
-  }
+  cancel(notificationId: any): Promise<any> { return; }
 
   /**
    * Cancels all notifications
@@ -210,9 +207,7 @@ export class LocalNotifications extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 2
   })
-  cancelAll(): Promise<any> {
-    return;
-  }
+  cancelAll(): Promise<any> { return; }
 
   /**
    * Checks presence of a notification
@@ -220,9 +215,7 @@ export class LocalNotifications extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isPresent(notificationId: number): Promise<boolean> {
-    return;
-  }
+  isPresent(notificationId: number): Promise<boolean> { return; }
 
   /**
    * Checks is a notification is scheduled
@@ -230,9 +223,7 @@ export class LocalNotifications extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isScheduled(notificationId: number): Promise<boolean> {
-    return;
-  }
+  isScheduled(notificationId: number): Promise<boolean> { return; }
 
   /**
    * Checks if a notification is triggered
@@ -240,36 +231,28 @@ export class LocalNotifications extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isTriggered(notificationId: number): Promise<boolean> {
-    return;
-  }
+  isTriggered(notificationId: number): Promise<boolean> { return; }
 
   /**
    * Get all the notification ids
    * @returns {Promise<Array<number>>}
    */
   @Cordova()
-  getAllIds(): Promise<Array<number>> {
-    return;
-  }
+  getAllIds(): Promise<Array<number>> { return; }
 
   /**
    * Get the ids of triggered notifications
    * @returns {Promise<Array<number>>}
    */
   @Cordova()
-  getTriggeredIds(): Promise<Array<number>> {
-    return;
-  }
+  getTriggeredIds(): Promise<Array<number>> { return; }
 
   /**
    * Get the ids of scheduled notifications
    * @returns {Promise<Array<number>>} Returns a promise
    */
   @Cordova()
-  getScheduledIds(): Promise<Array<number>> {
-    return;
-  }
+  getScheduledIds(): Promise<Array<number>> { return; }
 
   /**
    * Get a notification object
@@ -277,9 +260,7 @@ export class LocalNotifications extends IonicNativePlugin {
    * @returns {Promise<ILocalNotification>}
    */
   @Cordova()
-  get(notificationId: any): Promise<ILocalNotification> {
-    return;
-  }
+  get(notificationId: any): Promise<ILocalNotification> { return; }
 
   /**
    * Get a scheduled notification object
@@ -287,9 +268,7 @@ export class LocalNotifications extends IonicNativePlugin {
    * @returns {Promise<ILocalNotification>}
    */
   @Cordova()
-  getScheduled(notificationId: any): Promise<ILocalNotification> {
-    return;
-  }
+  getScheduled(notificationId: any): Promise<ILocalNotification> { return; }
 
   /**
    * Get a triggered notification object
@@ -297,54 +276,43 @@ export class LocalNotifications extends IonicNativePlugin {
    * @returns {Promise<ILocalNotification>}
    */
   @Cordova()
-  getTriggered(notificationId: any): Promise<ILocalNotification> {
-    return;
-  }
+  getTriggered(notificationId: any): Promise<ILocalNotification> { return; }
 
   /**
    * Get all notification objects
    * @returns {Promise<Array<ILocalNotification>>}
    */
   @Cordova()
-  getAll(): Promise<Array<ILocalNotification>> {
-    return;
-  }
+  getAll(): Promise<Array<ILocalNotification>> { return; }
 
   /**
    * Get all scheduled notification objects
    * @returns {Promise<Array<ILocalNotification>>}
    */
   @Cordova()
-  getAllScheduled(): Promise<Array<ILocalNotification>> {
-    return;
-  }
+  getAllScheduled(): Promise<Array<ILocalNotification>> { return; }
 
   /**
    * Get all triggered notification objects
    * @returns {Promise<Array<ILocalNotification>>}
    */
   @Cordova()
-  getAllTriggered(): Promise<Array<ILocalNotification>> {
-    return;
-  }
+  getAllTriggered(): Promise<Array<ILocalNotification>> { return; }
 
   /**
    * Request permission to show notifications if not already granted.
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  requestPermission(): Promise<boolean> {
-    return;
-  }
+  requestPermission(): Promise<boolean> { return; }
 
   /**
    * Informs if the app has the permission to show notifications.
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  hasPermission(): Promise<boolean> {
-    return;
-  }
+  hasPermission(): Promise<boolean> { return; }
+
 
   /**
    * Sets a callback for a specific event
@@ -354,7 +322,7 @@ export class LocalNotifications extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  on(eventName: string, callback: any): void {}
+  on(eventName: string, callback: any): void { }
 
   /**
    * Removes a callback of a specific event
@@ -364,5 +332,7 @@ export class LocalNotifications extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  un(eventName: string, callback: any): void {}
+  un(eventName: string, callback: any): void { }
+
+
 }
diff --git a/src/@ionic-native/plugins/location-accuracy/index.ts b/src/@ionic-native/plugins/location-accuracy/index.ts
index 77e14f26a..be74531ae 100644
--- a/src/@ionic-native/plugins/location-accuracy/index.ts
+++ b/src/@ionic-native/plugins/location-accuracy/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Location Accuracy
@@ -42,18 +42,14 @@ export class LocationAccuracy extends IonicNativePlugin {
    * @returns {Promise<boolean>} Returns a promise that resovles with a boolean that indicates if you can request accurate location
    */
   @Cordova()
-  canRequest(): Promise<boolean> {
-    return;
-  }
+  canRequest(): Promise<boolean> { return; }
 
   /**
    * Indicates if a request is currently in progress
    * @returns {Promise<boolean>} Returns a promise that resolves with a boolean that indicates if a request is currently in progress
    */
   @Cordova()
-  isRequesting(): Promise<boolean> {
-    return;
-  }
+  isRequesting(): Promise<boolean> { return; }
 
   /**
    * Requests accurate location
@@ -61,9 +57,7 @@ export class LocationAccuracy extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a promise that resolves on success and rejects if an error occurred
    */
   @Cordova({ callbackOrder: 'reverse' })
-  request(accuracy: number): Promise<any> {
-    return;
-  }
+  request(accuracy: number): Promise<any> { return; }
 
   /**
    * Convenience constant
@@ -142,4 +136,5 @@ export class LocationAccuracy extends IonicNativePlugin {
    * @type {number}
    */
   ERROR_GOOGLE_API_CONNECTION_FAILED = 4;
+
 }
diff --git a/src/@ionic-native/plugins/market/index.ts b/src/@ionic-native/plugins/market/index.ts
index 801c1fdeb..77718246b 100644
--- a/src/@ionic-native/plugins/market/index.ts
+++ b/src/@ionic-native/plugins/market/index.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 /**
  * @name Market
  * @description
@@ -27,6 +26,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Market extends IonicNativePlugin {
+
   /**
    * Opens an app in Google Play / App Store
    * @param appId {string} Package name
@@ -37,9 +37,7 @@ export class Market extends IonicNativePlugin {
     successName: 'success',
     errorName: 'failure'
   })
-  open(appId: string): Promise<any> {
-    return;
-  }
+  open(appId: string): Promise<any> { return; }
 
   /**
    * Search apps by keyword
@@ -52,7 +50,6 @@ export class Market extends IonicNativePlugin {
     errorName: 'failure',
     platforms: ['Android']
   })
-  search(keyword: string): Promise<any> {
-    return;
-  }
+  search(keyword: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/media-capture/index.ts b/src/@ionic-native/plugins/media-capture/index.ts
index 489766935..f1c5c0d19 100644
--- a/src/@ionic-native/plugins/media-capture/index.ts
+++ b/src/@ionic-native/plugins/media-capture/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare const navigator: any;
@@ -38,10 +33,7 @@ export interface MediaFile {
    * @param {Function} successCallback
    * @param {Function} errorCallback
    */
-  getFormatData(
-    successCallback: (data: MediaFileData) => any,
-    errorCallback?: (err: any) => any
-  ): void;
+  getFormatData(successCallback: (data: MediaFileData) => any, errorCallback?: (err: any) => any): void;
 }
 
 export interface MediaFileData {
@@ -109,7 +101,7 @@ export interface ConfigurationData {
   /**
    * The ASCII-encoded lowercase string representing the media type.
    */
-  type: string;
+    type: string;
   /**
    * The height of the image or video in pixels. The value is zero for sound clips.
    */
@@ -163,19 +155,22 @@ export class MediaCapture extends IonicNativePlugin {
    * The recording image sizes and formats supported by the device.
    * @returns {ConfigurationData[]}
    */
-  @CordovaProperty supportedImageModes: ConfigurationData[];
+  @CordovaProperty
+  supportedImageModes: ConfigurationData[];
 
   /**
    * The audio recording formats supported by the device.
    * @returns {ConfigurationData[]}
    */
-  @CordovaProperty supportedAudioModes: ConfigurationData[];
+  @CordovaProperty
+  supportedAudioModes: ConfigurationData[];
 
   /**
    * The recording video resolutions and formats supported by the device.
    * @returns {ConfigurationData[]}
    */
-  @CordovaProperty supportedVideoModes: ConfigurationData[];
+  @CordovaProperty
+  supportedVideoModes: ConfigurationData[];
 
   /**
    * Start the audio recorder application and return information about captured audio clip files.
@@ -185,9 +180,7 @@ export class MediaCapture extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  captureAudio(
-    options?: CaptureAudioOptions
-  ): Promise<MediaFile[] | CaptureError> {
+  captureAudio(options?: CaptureAudioOptions): Promise<MediaFile[] | CaptureError> {
     return;
   }
 
@@ -199,9 +192,7 @@ export class MediaCapture extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  captureImage(
-    options?: CaptureImageOptions
-  ): Promise<MediaFile[] | CaptureError> {
+  captureImage(options?: CaptureImageOptions): Promise<MediaFile[] | CaptureError> {
     return;
   }
 
@@ -213,9 +204,7 @@ export class MediaCapture extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  captureVideo(
-    options?: CaptureVideoOptions
-  ): Promise<MediaFile[] | CaptureError> {
+  captureVideo(options?: CaptureVideoOptions): Promise<MediaFile[] | CaptureError> {
     return;
   }
 
@@ -242,4 +231,5 @@ export class MediaCapture extends IonicNativePlugin {
   onPendingCaptureError(): Observable<CaptureError> {
     return;
   }
+
 }
diff --git a/src/@ionic-native/plugins/media/index.ts b/src/@ionic-native/plugins/media/index.ts
index e27ef4763..d0036b17e 100644
--- a/src/@ionic-native/plugins/media/index.ts
+++ b/src/@ionic-native/plugins/media/index.ts
@@ -1,11 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  checkAvailability,
-  CordovaInstance,
-  InstanceProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { CordovaInstance, Plugin, checkAvailability, IonicNativePlugin, InstanceProperty } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 
@@ -13,6 +7,7 @@ import { Observer } from 'rxjs/Observer';
  * @hidden
  */
 export class MediaObject {
+
   /**
    * An observable that notifies you on actions success
    */
@@ -31,37 +26,36 @@ export class MediaObject {
   /**
    * @hidden
    */
-  @InstanceProperty successCallback: Function;
+  @InstanceProperty
+  successCallback: Function;
 
   /**
    * @hidden
    */
-  @InstanceProperty errorCallback: Function;
+  @InstanceProperty
+  errorCallback: Function;
 
   /**
    * @hidden
    */
-  @InstanceProperty statusCallback: Function;
+  @InstanceProperty
+  statusCallback: Function;
 
   constructor(private _objectInstance: any) {
     this.onSuccess = new Observable<any>((observer: Observer<any>) => {
       this.successCallback = observer.next.bind(observer);
-      return () => (this.successCallback = () => {});
+      return () => this.successCallback = () => {};
     });
 
-    this.onError = new Observable<MEDIA_ERROR>(
-      (observer: Observer<MEDIA_ERROR>) => {
-        this.errorCallback = observer.next.bind(observer);
-        return () => (this.errorCallback = () => {});
-      }
-    );
+    this.onError = new Observable<MEDIA_ERROR>((observer: Observer<MEDIA_ERROR>) => {
+      this.errorCallback = observer.next.bind(observer);
+      return () => this.errorCallback = () => {};
+    });
 
-    this.onStatusUpdate = new Observable<MEDIA_STATUS>(
-      (observer: Observer<MEDIA_STATUS>) => {
-        this.statusCallback = observer.next.bind(observer);
-        return () => (this.statusCallback = () => {});
-      }
-    );
+    this.onStatusUpdate = new Observable<MEDIA_STATUS>((observer: Observer<MEDIA_STATUS>) => {
+      this.statusCallback = observer.next.bind(observer);
+      return () => this.statusCallback = () => {};
+    });
   }
 
   /**
@@ -69,62 +63,56 @@ export class MediaObject {
    * @returns {Promise<any>} Returns a promise with the amplitude of the current recording
    */
   @CordovaInstance()
-  getCurrentAmplitude(): Promise<any> {
-    return;
-  }
+  getCurrentAmplitude(): Promise<any> { return; }
 
   /**
    * Get the current position within an audio file. Also updates the Media object's position parameter.
    * @returns {Promise<any>} Returns a promise with the position of the current recording
    */
   @CordovaInstance()
-  getCurrentPosition(): Promise<any> {
-    return;
-  }
+  getCurrentPosition(): Promise<any> { return; }
 
   /**
    * Get the duration of an audio file in seconds. If the duration is unknown, it returns a value of -1.
    * @returns {number} Returns a promise with the duration of the current recording
    */
   @CordovaInstance({ sync: true })
-  getDuration(): number {
-    return;
-  }
+  getDuration(): number { return; }
 
   /**
    * Starts or resumes playing an audio file.
    */
   @CordovaInstance({ sync: true })
   play(iosOptions?: {
-    numberOfLoops?: number;
-    playAudioWhenScreenIsLocked?: boolean;
-  }): void {}
+    numberOfLoops?: number,
+    playAudioWhenScreenIsLocked?: boolean
+  }): void { }
 
   /**
    * Pauses playing an audio file.
    */
   @CordovaInstance({ sync: true })
-  pause(): void {}
+  pause(): void { }
 
   /**
    * Releases the underlying operating system's audio resources. This is particularly important for Android, since there are a finite amount of OpenCore instances for media playback. Applications should call the release function for any Media resource that is no longer needed.
    */
   @CordovaInstance({ sync: true })
-  release(): void {}
+  release(): void { }
 
   /**
    * Sets the current position within an audio file.
    * @param {number} milliseconds The time position you want to set for the current audio file
    */
   @CordovaInstance({ sync: true })
-  seekTo(milliseconds: number): void {}
+  seekTo(milliseconds: number): void { }
 
   /**
    * Set the volume for an audio file.
    * @param volume {number} The volume to set for playback. The value must be within the range of 0.0 to 1.0.
    */
   @CordovaInstance({ sync: true })
-  setVolume(volume: number): void {}
+  setVolume(volume: number): void { }
 
   @CordovaInstance({ sync: true })
   setRate(speedRate: number): void {}
@@ -133,36 +121,38 @@ export class MediaObject {
    * Starts recording an audio file.
    */
   @CordovaInstance({ sync: true })
-  startRecord(): void {}
+  startRecord(): void { }
 
   /**
    * Stops recording
    */
   @CordovaInstance({ sync: true })
-  stopRecord(): void {}
+  stopRecord(): void { }
 
   /**
    * Pauses recording
    */
   @CordovaInstance({ sync: true })
-  pauseRecord(): void {}
+  pauseRecord(): void { }
 
   /**
    * Resumes recording
    */
   @CordovaInstance({ sync: true })
-  resumeRecord(): void {}
+  resumeRecord(): void { }
 
   /**
    * Stops playing an audio file.
    */
   @CordovaInstance({ sync: true })
-  stop(): void {}
+  stop(): void { }
+
 }
 
 export type MediaStatusUpdateCallback = (statusCode: number) => void;
 
 export interface MediaError {
+
   /**
    * Error message
    */
@@ -172,6 +162,7 @@ export interface MediaError {
    * Error code
    */
   code: number;
+
 }
 
 export enum MEDIA_STATUS {
@@ -297,6 +288,7 @@ export type MediaErrorCallback = (error: MediaError) => void;
 })
 @Injectable()
 export class Media extends IonicNativePlugin {
+
   // Constants
   /**
    * @hidden
@@ -345,14 +337,12 @@ export class Media extends IonicNativePlugin {
   create(src: string): MediaObject {
     let instance: any;
 
-    if (
-      checkAvailability(Media.getPluginRef(), null, Media.getPluginName()) ===
-      true
-    ) {
+    if (checkAvailability(Media.getPluginRef(), null, Media.getPluginName()) === true) {
       // Creates a new media object
       instance = new (Media.getPlugin())(src);
     }
 
     return new MediaObject(instance);
   }
+
 }
diff --git a/src/@ionic-native/plugins/mixpanel/index.ts b/src/@ionic-native/plugins/mixpanel/index.ts
index 022619cb3..debf12a63 100644
--- a/src/@ionic-native/plugins/mixpanel/index.ts
+++ b/src/@ionic-native/plugins/mixpanel/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 declare var mixpanel: any;
 
@@ -33,6 +33,7 @@ declare var mixpanel: any;
 })
 @Injectable()
 export class Mixpanel extends IonicNativePlugin {
+
   /**
    *
    * @param aliasId {string}
@@ -40,26 +41,20 @@ export class Mixpanel extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  alias(aliasId: string, originalId: string): Promise<any> {
-    return;
-  }
+  alias(aliasId: string, originalId: string): Promise<any> { return; }
 
   /**
    *
    * @returns {Promise<any>}
    */
   @Cordova()
-  distinctId(): Promise<any> {
-    return;
-  }
+  distinctId(): Promise<any> { return; }
 
   /**
    * @returns {Promise<any>}
    */
   @Cordova()
-  flush(): Promise<any> {
-    return;
-  }
+  flush(): Promise<any> { return; }
 
   /**
    *
@@ -67,9 +62,7 @@ export class Mixpanel extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  identify(distinctId: string): Promise<any> {
-    return;
-  }
+  identify(distinctId: string): Promise<any> { return; }
 
   /**
    *
@@ -77,9 +70,7 @@ export class Mixpanel extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  init(token: string): Promise<any> {
-    return;
-  }
+  init(token: string): Promise<any> { return; }
 
   /**
    *
@@ -87,18 +78,14 @@ export class Mixpanel extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  registerSuperProperties(superProperties: any): Promise<any> {
-    return;
-  }
+  registerSuperProperties(superProperties: any): Promise<any> { return; }
 
   /**
    *
    * @returns {Promise<any>}
    */
   @Cordova()
-  reset(): Promise<any> {
-    return;
-  }
+  reset(): Promise<any> { return; }
 
   /**
    *
@@ -106,9 +93,7 @@ export class Mixpanel extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  timeEvent(eventName: string): Promise<any> {
-    return;
-  }
+  timeEvent(eventName: string): Promise<any> { return; }
 
   /**
    *
@@ -120,9 +105,8 @@ export class Mixpanel extends IonicNativePlugin {
     successIndex: 2,
     errorIndex: 3
   })
-  track(eventName: string, eventProperties?: any): Promise<any> {
-    return;
-  }
+  track(eventName: string, eventProperties?: any): Promise<any> { return; }
+
 }
 /**
  * @hidden
@@ -134,15 +118,14 @@ export class Mixpanel extends IonicNativePlugin {
 })
 @Injectable()
 export class MixpanelPeople extends IonicNativePlugin {
+
   /**
    *
    * @param distinctId {string}
    * @return {Promise<any>}
    */
   @Cordova()
-  identify(distinctId: string): Promise<any> {
-    return;
-  }
+  identify(distinctId: string): Promise<any> { return; }
 
   /**
    *
@@ -150,9 +133,7 @@ export class MixpanelPeople extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  increment(peopleProperties: any): Promise<any> {
-    return;
-  }
+  increment(peopleProperties: any): Promise<any> { return; }
 
   /**
    *
@@ -160,9 +141,7 @@ export class MixpanelPeople extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  setPushId(pushId: string): Promise<any> {
-    return;
-  }
+  setPushId(pushId: string): Promise<any> { return; }
 
   /**
    *
@@ -170,9 +149,7 @@ export class MixpanelPeople extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  set(peopleProperties: any): Promise<any> {
-    return;
-  }
+  set(peopleProperties: any): Promise<any> { return; }
 
   /**
    *
@@ -180,7 +157,6 @@ export class MixpanelPeople extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  setOnce(peopleProperties: any): Promise<any> {
-    return;
-  }
+  setOnce(peopleProperties: any): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/mobile-accessibility/index.ts b/src/@ionic-native/plugins/mobile-accessibility/index.ts
index e6498ea3b..f7348b7f0 100644
--- a/src/@ionic-native/plugins/mobile-accessibility/index.ts
+++ b/src/@ionic-native/plugins/mobile-accessibility/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Mobile Accessibility
@@ -29,25 +29,26 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class MobileAccessibility extends IonicNativePlugin {
+
   MobileAccessibilityNotifications: {
-    ANNOUNCEMENT: 'ANNOUNCEMENT';
-    BOLD_TEXT_STATUS_CHANGED: 'BOLD_TEXT_STATUS_CHANGED';
-    CLOSED_CAPTIONING_STATUS_CHANGED: 'CLOSED_CAPTIONING_STATUS_CHANGED';
-    DARKER_SYSTEM_COLORS_STATUS_CHANGED: 'DARKER_SYSTEM_COLORS_STATUS_CHANGED';
-    GRAYSCALE_STATUS_CHANGED: 'GRAYSCALE_STATUS_CHANGED';
-    GUIDED_ACCESS_STATUS_CHANGED: 'GUIDED_ACCESS_STATUS_CHANGED';
-    INVERT_COLORS_STATUS_CHANGED: 'INVERT_COLORS_STATUS_CHANGED';
-    LAYOUT_CHANGED: 'LAYOUT_CHANGED';
-    MONO_AUDIO_STATUS_CHANGED: 'MONO_AUDIO_STATUS_CHANGED';
-    PAGE_SCROLLED: 'PAGE_SCROLLED';
-    REDUCE_MOTION_STATUS_CHANGED: 'REDUCE_MOTION_STATUS_CHANGED';
-    REDUCE_TRANSPARENCY_STATUS_CHANGED: 'REDUCE_TRANSPARENCY_STATUS_CHANGED';
-    SCREEN_CHANGED: 'SCREEN_CHANGED';
-    SCREEN_READER_STATUS_CHANGED: 'SCREEN_READER_STATUS_CHANGED';
-    SPEAK_SCREEN_STATUS_CHANGED: 'SPEAK_SCREEN_STATUS_CHANGED';
-    SPEAK_SELECTION_STATUS_CHANGED: 'SPEAK_SELECTION_STATUS_CHANGED';
-    SWITCH_CONTROL_STATUS_CHANGED: 'SWITCH_CONTROL_STATUS_CHANGED';
-    TOUCH_EXPLORATION_STATUS_CHANGED: 'TOUCH_EXPLORATION_STATUS_CHANGED';
+    ANNOUNCEMENT: 'ANNOUNCEMENT',
+    BOLD_TEXT_STATUS_CHANGED: 'BOLD_TEXT_STATUS_CHANGED',
+    CLOSED_CAPTIONING_STATUS_CHANGED: 'CLOSED_CAPTIONING_STATUS_CHANGED',
+    DARKER_SYSTEM_COLORS_STATUS_CHANGED: 'DARKER_SYSTEM_COLORS_STATUS_CHANGED',
+    GRAYSCALE_STATUS_CHANGED: 'GRAYSCALE_STATUS_CHANGED',
+    GUIDED_ACCESS_STATUS_CHANGED: 'GUIDED_ACCESS_STATUS_CHANGED',
+    INVERT_COLORS_STATUS_CHANGED: 'INVERT_COLORS_STATUS_CHANGED',
+    LAYOUT_CHANGED: 'LAYOUT_CHANGED',
+    MONO_AUDIO_STATUS_CHANGED: 'MONO_AUDIO_STATUS_CHANGED',
+    PAGE_SCROLLED: 'PAGE_SCROLLED',
+    REDUCE_MOTION_STATUS_CHANGED: 'REDUCE_MOTION_STATUS_CHANGED',
+    REDUCE_TRANSPARENCY_STATUS_CHANGED: 'REDUCE_TRANSPARENCY_STATUS_CHANGED',
+    SCREEN_CHANGED: 'SCREEN_CHANGED',
+    SCREEN_READER_STATUS_CHANGED: 'SCREEN_READER_STATUS_CHANGED',
+    SPEAK_SCREEN_STATUS_CHANGED: 'SPEAK_SCREEN_STATUS_CHANGED',
+    SPEAK_SELECTION_STATUS_CHANGED: 'SPEAK_SELECTION_STATUS_CHANGED',
+    SWITCH_CONTROL_STATUS_CHANGED: 'SWITCH_CONTROL_STATUS_CHANGED',
+    TOUCH_EXPLORATION_STATUS_CHANGED: 'TOUCH_EXPLORATION_STATUS_CHANGED'
   };
 
   /**
@@ -55,27 +56,21 @@ export class MobileAccessibility extends IonicNativePlugin {
    * @returns {Promise<boolean>}  A result method to receive the boolean result asynchronously from the native MobileAccessibility plugin.
    */
   @Cordova()
-  isScreenReaderRunning(): Promise<boolean> {
-    return;
-  }
+  isScreenReaderRunning(): Promise<boolean> { return; }
 
   /**
    * An iOS-specific proxy for the MobileAccessibility.isScreenReaderRunning method
    * @returns {Promise<boolean>} A result method to receive the boolean result asynchronously from the native MobileAccessibility plugin.
    */
   @Cordova({ platforms: ['iOS'] })
-  isVoiceOverRunning(): Promise<boolean> {
-    return;
-  }
+  isVoiceOverRunning(): Promise<boolean> { return; }
 
   /**
    * An Android/Amazon Fire OS-specific proxy for the MobileAccessibility.isScreenReaderRunning method.
    * @returns {Promise<boolean>}  A result method to receive the boolean result asynchronously from the native MobileAccessibility plugin.
    */
   @Cordova({ platforms: ['Amazon Fire OS', 'Android'] })
-  isTalkBackRunning(): Promise<boolean> {
-    return;
-  }
+  isTalkBackRunning(): Promise<boolean> { return; }
 
   /**
    * On Android, this method returns true if ChromeVox is active and properly initialized with access to the text to speech API in the WebView.
@@ -83,154 +78,124 @@ export class MobileAccessibility extends IonicNativePlugin {
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['Amazon Fire OS', 'Android'] })
-  isChromeVoxActive(): Promise<boolean> {
-    return;
-  }
+  isChromeVoxActive(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isBoldTextEnabled(): Promise<boolean> {
-    return;
-  }
+  isBoldTextEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova()
-  isClosedCaptioningEnabled(): Promise<boolean> {
-    return;
-  }
+  isClosedCaptioningEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isDarkerSystemColorsEnabled(): Promise<boolean> {
-    return;
-  }
+  isDarkerSystemColorsEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isGrayscaleEnabled(): Promise<boolean> {
-    return;
-  }
+  isGrayscaleEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isGuidedAccessEnabled(): Promise<boolean> {
-    return;
-  }
+  isGuidedAccessEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isInvertColorsEnabled(): Promise<boolean> {
-    return;
-  }
+  isInvertColorsEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isMonoAudioEnabled(): Promise<boolean> {
-    return;
-  }
+  isMonoAudioEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isReduceMotionEnabled(): Promise<boolean> {
-    return;
-  }
+  isReduceMotionEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isReduceTransparencyEnabled(): Promise<boolean> {
-    return;
-  }
+  isReduceTransparencyEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isSpeakScreenEnabled(): Promise<boolean> {
-    return;
-  }
+  isSpeakScreenEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isSpeakSelectionEnabled(): Promise<boolean> {
-    return;
-  }
+  isSpeakSelectionEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  isSwitchControlRunning(): Promise<boolean> {
-    return;
-  }
+  isSwitchControlRunning(): Promise<boolean> { return; }
 
   /**
    *
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['Amazon Fire OS', 'Android'] })
-  isTouchExplorationEnabled(): Promise<boolean> {
-    return;
-  }
+  isTouchExplorationEnabled(): Promise<boolean> { return; }
 
   /**
    *
    * * @returns {Promise<number>} Returns the result
    */
   @Cordova()
-  getTextZoom(): Promise<number> {
-    return;
-  }
+  getTextZoom(): Promise<number> { return; }
 
   /**
    * @param textZoom {number} A percentage value by which text in the WebView should be scaled.
    */
   @Cordova({ sync: true })
-  setTextZoom(textZoom: number): void {}
+  setTextZoom(textZoom: number): void { }
 
   /**
    *
    */
   @Cordova({ sync: true })
-  updateTextZoom(): void {}
+  updateTextZoom(): void { }
 
   /**
    * A Boolean value which specifies whether to use the preferred text zoom of a default percent value of 100.
    * @param value {boolean} Returns the result
    */
   @Cordova({ sync: true })
-  usePreferredTextZoom(value: boolean): void {}
+  usePreferredTextZoom(value: boolean): void { }
 
   /**
    * Posts a notification with a string for the screen reader to announce if it is running.
@@ -239,12 +204,7 @@ export class MobileAccessibility extends IonicNativePlugin {
    * @returns {Promise<boolean>} Returns the result
    */
   @Cordova({ platforms: ['iOS'] })
-  postNotification(
-    mobileAccessibilityNotification: any,
-    value: string
-  ): Promise<boolean> {
-    return;
-  }
+  postNotification(mobileAccessibilityNotification: any, value: string): Promise<boolean> { return; }
 
   /**
    * Speaks a given string through the screenreader. On Android, if ChromeVox is active, it will use the specified queueMode and properties.
@@ -253,11 +213,12 @@ export class MobileAccessibility extends IonicNativePlugin {
    * @param properties {any}
    */
   @Cordova({ sync: true })
-  speak(value: string, queueMode?: number, properties?: any): void {}
+  speak(value: string, queueMode?: number, properties?: any): void { }
 
   /**
    * Stops speech.
    */
   @Cordova({ sync: true })
-  stop(): void {}
+  stop(): void { }
+
 }
diff --git a/src/@ionic-native/plugins/ms-adal/index.ts b/src/@ionic-native/plugins/ms-adal/index.ts
index cd656ffde..ab0e55d88 100644
--- a/src/@ionic-native/plugins/ms-adal/index.ts
+++ b/src/@ionic-native/plugins/ms-adal/index.ts
@@ -1,13 +1,8 @@
+import { Plugin, IonicNativePlugin, checkAvailability, InstanceProperty, CordovaInstance } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import {
-  checkAvailability,
-  CordovaInstance,
-  InstanceProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 
 export interface AuthenticationResult {
+
   accessToken: string;
   accesSTokenType: string;
   expiresOn: Date;
@@ -23,6 +18,7 @@ export interface AuthenticationResult {
    * @returns {String} The authorization header.
    */
   createAuthorizationHeader(): string;
+
 }
 
 export interface TokenCache {
@@ -54,6 +50,7 @@ export interface UserInfo {
   uniqueId: string;
 }
 
+
 /**
  * @name MS ADAL
  * @description
@@ -99,30 +96,30 @@ export interface UserInfo {
 })
 @Injectable()
 export class MSAdal extends IonicNativePlugin {
-  createAuthenticationContext(
-    authority: string,
-    validateAuthority: boolean = true
-  ) {
+
+  createAuthenticationContext(authority: string, validateAuthority: boolean = true) {
     let authContext: any;
-    if (
-      checkAvailability(MSAdal.getPluginRef(), null, MSAdal.getPluginName()) ===
-      true
-    ) {
+    if (checkAvailability(MSAdal.getPluginRef(), null, MSAdal.getPluginName()) === true) {
       authContext = new (MSAdal.getPlugin()).AuthenticationContext(authority);
     }
     return new AuthenticationContext(authContext);
   }
+
 }
 
 /**
  * @hidden
  */
 export class AuthenticationContext {
-  @InstanceProperty authority: string;
 
-  @InstanceProperty validateAuthority: boolean;
+  @InstanceProperty
+  authority: string;
 
-  @InstanceProperty tokenCache: any;
+  @InstanceProperty
+  validateAuthority: boolean;
+
+  @InstanceProperty
+  tokenCache: any;
 
   constructor(private _objectInstance: any) {}
 
@@ -141,15 +138,7 @@ export class AuthenticationContext {
   @CordovaInstance({
     otherPromise: true
   })
-  acquireTokenAsync(
-    resourceUrl: string,
-    clientId: string,
-    redirectUrl: string,
-    userId?: string,
-    extraQueryParameters?: any
-  ): Promise<AuthenticationResult> {
-    return;
-  }
+  acquireTokenAsync(resourceUrl: string, clientId: string, redirectUrl: string, userId?: string, extraQueryParameters?: any): Promise<AuthenticationResult> { return; }
 
   /**
    * Acquires token WITHOUT using interactive flow. It checks the cache to return existing result
@@ -164,11 +153,6 @@ export class AuthenticationContext {
   @CordovaInstance({
     otherPromise: true
   })
-  acquireTokenSilentAsync(
-    resourceUrl: string,
-    clientId: string,
-    userId?: string
-  ): Promise<AuthenticationResult> {
-    return;
-  }
+  acquireTokenSilentAsync(resourceUrl: string, clientId: string, userId?: string): Promise<AuthenticationResult> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/music-controls/index.ts b/src/@ionic-native/plugins/music-controls/index.ts
index 7dbb83b56..383b45d8b 100644
--- a/src/@ionic-native/plugins/music-controls/index.ts
+++ b/src/@ionic-native/plugins/music-controls/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface MusicControlsOptions {
@@ -140,24 +140,21 @@ export interface MusicControlsOptions {
 })
 @Injectable()
 export class MusicControls extends IonicNativePlugin {
+
   /**
    * Create the media controls
    * @param options {MusicControlsOptions}
    * @returns {Promise<any>}
    */
   @Cordova()
-  create(options: MusicControlsOptions): Promise<any> {
-    return;
-  }
+  create(options: MusicControlsOptions): Promise<any> { return; }
 
   /**
    * Destroy the media controller
    * @returns {Promise<any>}
    */
   @Cordova()
-  destroy(): Promise<any> {
-    return;
-  }
+  destroy(): Promise<any> { return; }
 
   /**
    * Subscribe to the events of the media controller
@@ -166,36 +163,34 @@ export class MusicControls extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  subscribe(): Observable<any> {
-    return;
-  }
+  subscribe(): Observable<any> { return; }
 
   /**
    * Start listening for events, this enables the Observable from the subscribe method
    */
   @Cordova({ sync: true })
-  listen(): void {}
+  listen(): void { }
 
   /**
    * Toggle play/pause:
    * @param isPlaying {boolean}
    */
   @Cordova()
-  updateIsPlaying(isPlaying: boolean): void {}
+  updateIsPlaying(isPlaying: boolean): void { }
 
   /**
-   * Update elapsed time, optionally toggle play/pause:
-   * @param args {Object}
-   */
+  * Update elapsed time, optionally toggle play/pause:
+  * @param args {Object}
+  */
   @Cordova({
     platforms: ['iOS']
   })
-  updateElapsed(args: { elapsed: string; isPlaying: boolean }): void {}
+  updateElapsed(args: { elapsed: string; isPlaying: boolean; }): void { }
 
   /**
    * Toggle dismissable:
    * @param dismissable {boolean}
    */
   @Cordova()
-  updateDismissable(dismissable: boolean): void {}
+  updateDismissable(dismissable: boolean): void { }
 }
diff --git a/src/@ionic-native/plugins/native-audio/index.ts b/src/@ionic-native/plugins/native-audio/index.ts
index 62d053236..91dca64b4 100644
--- a/src/@ionic-native/plugins/native-audio/index.ts
+++ b/src/@ionic-native/plugins/native-audio/index.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 /**
  * @name Native Audio
  * @description Native Audio Playback
@@ -46,9 +45,7 @@ export class NativeAudio extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  preloadSimple(id: string, assetPath: string): Promise<any> {
-    return;
-  }
+  preloadSimple(id: string, assetPath: string): Promise<any> {return; }
 
   /**
    * Loads an audio file into memory. Optimized for background music / ambient sound. Uses highlevel native APIs with a larger footprint. (iOS: AVAudioPlayer). Can be stopped / looped and used with multiple voices. Can be faded in and out using the delay parameter.
@@ -60,15 +57,7 @@ export class NativeAudio extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  preloadComplex(
-    id: string,
-    assetPath: string,
-    volume: number,
-    voices: number,
-    delay: number
-  ): Promise<any> {
-    return;
-  }
+  preloadComplex(id: string, assetPath: string, volume: number, voices: number, delay: number): Promise<any> {return; }
 
   /**
    * Plays an audio asset
@@ -80,9 +69,7 @@ export class NativeAudio extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  play(id: string, completeCallback?: Function): Promise<any> {
-    return;
-  }
+  play(id: string, completeCallback?: Function): Promise<any> {return; }
 
   /**
    * Stops playing an audio
@@ -90,9 +77,7 @@ export class NativeAudio extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stop(id: string): Promise<any> {
-    return;
-  }
+  stop(id: string): Promise<any> {return; }
 
   /**
    * Loops an audio asset infinitely, this only works for complex assets
@@ -100,9 +85,7 @@ export class NativeAudio extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  loop(id: string): Promise<any> {
-    return;
-  }
+  loop(id: string): Promise<any> {return; }
 
   /**
    * Unloads an audio file from memory
@@ -110,9 +93,7 @@ export class NativeAudio extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  unload(id: string): Promise<any> {
-    return;
-  }
+  unload(id: string): Promise<any> {return; }
 
   /**
    * Changes the volume for preloaded complex assets.
@@ -121,7 +102,6 @@ export class NativeAudio extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  setVolumeForComplexAsset(id: string, volume: number): Promise<any> {
-    return;
-  }
+  setVolumeForComplexAsset(id: string, volume: number): Promise<any> {return; }
+
 }
diff --git a/src/@ionic-native/plugins/native-geocoder/index.ts b/src/@ionic-native/plugins/native-geocoder/index.ts
index 811a0f7f9..176be8027 100644
--- a/src/@ionic-native/plugins/native-geocoder/index.ts
+++ b/src/@ionic-native/plugins/native-geocoder/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Native Geocoder
@@ -35,6 +35,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class NativeGeocoder extends IonicNativePlugin {
+
   /**
    * Reverse geocode a given latitude and longitude to find location address
    * @param latitude {number} The latitude
@@ -44,12 +45,7 @@ export class NativeGeocoder extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  reverseGeocode(
-    latitude: number,
-    longitude: number
-  ): Promise<NativeGeocoderReverseResult> {
-    return;
-  }
+  reverseGeocode(latitude: number, longitude: number): Promise<NativeGeocoderReverseResult> { return; }
 
   /**
    * Forward geocode a given address to find coordinates
@@ -59,14 +55,12 @@ export class NativeGeocoder extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  forwardGeocode(addressString: string): Promise<NativeGeocoderForwardResult> {
-    return;
-  }
+  forwardGeocode(addressString: string): Promise<NativeGeocoderForwardResult> { return; }
 }
 
 /**
  * Encapsulates format information about a reverse geocoding result.
- * more Info:
+ * more Info: 
  *  - https://developer.apple.com/documentation/corelocation/clplacemark
  *  - https://developer.android.com/reference/android/location/Address.html
  */
diff --git a/src/@ionic-native/plugins/native-keyboard/index.ts b/src/@ionic-native/plugins/native-keyboard/index.ts
index c91c00822..ea070c564 100644
--- a/src/@ionic-native/plugins/native-keyboard/index.ts
+++ b/src/@ionic-native/plugins/native-keyboard/index.ts
@@ -1,7 +1,8 @@
+import { Plugin, IonicNativePlugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface NativeKeyboardOptions {
+
   /**
    * A function invoked when the user submits his input. Receives the text as a single property. Make sure your page is UTF-8 encoded so Chinese and Emoji are rendered OK.
    */
@@ -126,6 +127,7 @@ export interface NativeKeyboardOptions {
    *
    */
   rightButton: NativeKeyboardButton;
+
 }
 
 export interface NativeKeyboardButton {
@@ -202,6 +204,7 @@ export interface NativeKeyboardUpdateMessengerOptions {
 })
 @Injectable()
 export class NativeKeyboard extends IonicNativePlugin {
+
   /**
    * Show messenger
    * @param options {NativeKeyboardOptions}
@@ -221,24 +224,19 @@ export class NativeKeyboard extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  showMessengerKeyboard(): Promise<any> {
-    return;
-  }
+  showMessengerKeyboard(): Promise<any> { return; }
 
   /**
    * Programmatically hide the keyboard (but not the messenger bar)
    */
   @Cordova()
-  hideMessengerKeyboard(): Promise<any> {
-    return;
-  }
+  hideMessengerKeyboard(): Promise<any> { return; }
 
   /**
    * Manipulate the messenger while it's open. For instance if you want to update the text programmatically based on what the user typed.
    * @param options
    */
   @Cordova()
-  updateMessenger(options: NativeKeyboardUpdateMessengerOptions): Promise<any> {
-    return;
-  }
+  updateMessenger(options: NativeKeyboardUpdateMessengerOptions): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/native-page-transitions/index.ts b/src/@ionic-native/plugins/native-page-transitions/index.ts
index 09dc82da7..537588b3c 100644
--- a/src/@ionic-native/plugins/native-page-transitions/index.ts
+++ b/src/@ionic-native/plugins/native-page-transitions/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface NativeTransitionOptions {
   direction?: string;
@@ -76,9 +76,7 @@ export class NativePageTransitions extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  slide(options: NativeTransitionOptions): Promise<any> {
-    return;
-  }
+  slide(options: NativeTransitionOptions): Promise<any> { return; }
 
   /**
    * Perform a flip animation
@@ -86,9 +84,7 @@ export class NativePageTransitions extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  flip(options: NativeTransitionOptions): Promise<any> {
-    return;
-  }
+  flip(options: NativeTransitionOptions): Promise<any> { return; }
 
   /**
    * Perform a fade animation
@@ -96,9 +92,8 @@ export class NativePageTransitions extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS', 'Android'] })
-  fade(options: NativeTransitionOptions): Promise<any> {
-    return;
-  }
+  fade(options: NativeTransitionOptions): Promise<any> { return; }
+
 
   /**
    * Perform a slide animation
@@ -106,9 +101,9 @@ export class NativePageTransitions extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS', 'Android'] })
-  drawer(options: NativeTransitionOptions): Promise<any> {
-    return;
-  }
+  drawer(options: NativeTransitionOptions): Promise<any> { return; }
+
+
 
   /**
    * Perform a slide animation
@@ -116,25 +111,20 @@ export class NativePageTransitions extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  curl(options: NativeTransitionOptions): Promise<any> {
-    return;
-  }
+  curl(options: NativeTransitionOptions): Promise<any> { return; }
 
   /**
    * Execute pending transition
    * @returns {Promise<any>}
    */
   @Cordova()
-  executePendingTransition(): Promise<any> {
-    return;
-  }
+  executePendingTransition(): Promise<any> { return; }
 
   /**
    * Cancel pending transition
    * @returns {Promise<any>}
    */
   @Cordova()
-  cancelPendingTransition(): Promise<any> {
-    return;
-  }
+  cancelPendingTransition(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/native-ringtones/index.ts b/src/@ionic-native/plugins/native-ringtones/index.ts
index 896d97e40..f0fad32b0 100644
--- a/src/@ionic-native/plugins/native-ringtones/index.ts
+++ b/src/@ionic-native/plugins/native-ringtones/index.ts
@@ -1,5 +1,5 @@
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @beta
@@ -33,14 +33,13 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class NativeRingtones extends IonicNativePlugin {
+
   /**
    * Get the ringtone list of the device
    * @return {Promise<any>} Returns a promise that resolves when ringtones found successfully
    */
   @Cordova()
-  getRingtone(): Promise<any> {
-    return;
-  }
+  getRingtone(): Promise<any> { return; }
 
   /**
    * This function starts playing the ringtone
@@ -48,9 +47,7 @@ export class NativeRingtones extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  playRingtone(ringtoneUri: string): Promise<any> {
-    return;
-  }
+  playRingtone(ringtoneUri: string): Promise<any> { return; }
 
   /**
    * This function stops playing the ringtone
@@ -58,7 +55,5 @@ export class NativeRingtones extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  stopRingtone(ringtoneUri: string): Promise<any> {
-    return;
-  }
+  stopRingtone(ringtoneUri: string): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/native-storage/index.ts b/src/@ionic-native/plugins/native-storage/index.ts
index 424bd3f1e..15b498c3f 100644
--- a/src/@ionic-native/plugins/native-storage/index.ts
+++ b/src/@ionic-native/plugins/native-storage/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name Native Storage
@@ -42,9 +43,7 @@ export class NativeStorage extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  setItem(reference: string, value: any): Promise<any> {
-    return;
-  }
+  setItem(reference: string, value: any): Promise<any> { return; }
 
   /**
    * Gets a stored item
@@ -52,18 +51,14 @@ export class NativeStorage extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  getItem(reference: string): Promise<any> {
-    return;
-  }
+  getItem(reference: string): Promise<any> { return; }
 
   /**
    * Retrieving all keys
    * @returns {Promise<any>}
    */
   @Cordova()
-  keys(): Promise<any> {
-    return;
-  }
+  keys(): Promise<any> { return; }
 
   /**
    * Removes a single stored item
@@ -71,16 +66,13 @@ export class NativeStorage extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  remove(reference: string): Promise<any> {
-    return;
-  }
+  remove(reference: string): Promise<any> { return; }
 
   /**
    * Removes all stored values.
    * @returns {Promise<any>}
    */
   @Cordova()
-  clear(): Promise<any> {
-    return;
-  }
+  clear(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/navigation-bar/index.ts b/src/@ionic-native/plugins/navigation-bar/index.ts
index c7126063d..784f3501b 100644
--- a/src/@ionic-native/plugins/navigation-bar/index.ts
+++ b/src/@ionic-native/plugins/navigation-bar/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @beta
@@ -28,22 +29,10 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class NavigationBar extends IonicNativePlugin {
-  /**
-   * hide automatically (or not) the navigation bar.
-   * @param autohide {boolean}
-   * @return {Promise<any>}
-   */
-  @Cordova({
-    callbackStyle: 'object',
-    successName: 'success',
-    errorName: 'failure'
-  })
-  setUp(autohide?: boolean): Promise<any> {
-    return;
-  }
 
   /**
-   * Hide the navigation bar.
+   * hide automatically (or not) the navigation bar.
+   * @param autohide {boolean}  
    * @return {Promise<any>}
    */
   @Cordova({
@@ -51,7 +40,17 @@ export class NavigationBar extends IonicNativePlugin {
     successName: 'success',
     errorName: 'failure'
   })
-  hideNavigationBar(): Promise<any> {
-    return;
-  }
+  setUp(autohide?: boolean): Promise<any> { return; }
+
+  /**
+   * Hide the navigation bar. 
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    callbackStyle: 'object',
+    successName: 'success',
+    errorName: 'failure'
+  })
+  hideNavigationBar(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/network-interface/index.ts b/src/@ionic-native/plugins/network-interface/index.ts
index e94ac7951..7a68fb12a 100644
--- a/src/@ionic-native/plugins/network-interface/index.ts
+++ b/src/@ionic-native/plugins/network-interface/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Network Interface
@@ -26,17 +26,11 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-networkinterface',
   pluginRef: 'networkinterface',
   repo: 'https://github.com/salbahra/cordova-plugin-networkinterface',
-  platforms: [
-    'Android',
-    'BlackBerry 10',
-    'Browser',
-    'iOS',
-    'Windows',
-    'Windows Phone'
-  ]
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'Windows', 'Windows Phone'],
 })
 @Injectable()
 export class NetworkInterface extends IonicNativePlugin {
+
   @Cordova()
   getIPAddress(): Promise<string> {
     return;
diff --git a/src/@ionic-native/plugins/network/index.ts b/src/@ionic-native/plugins/network/index.ts
index e1d641ed9..3148bcd8c 100644
--- a/src/@ionic-native/plugins/network/index.ts
+++ b/src/@ionic-native/plugins/network/index.ts
@@ -1,14 +1,8 @@
+import { Injectable } from '@angular/core';
+import { Cordova, CordovaProperty, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/merge';
 
-import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaCheck,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
 
 declare const navigator: any;
 
@@ -63,17 +57,20 @@ declare const navigator: any;
 })
 @Injectable()
 export class Network extends IonicNativePlugin {
+
   /**
    * Connection type
    * @return {string}
    */
-  @CordovaProperty type: string;
+  @CordovaProperty
+  type: string;
 
   /**
    * Downlink Max Speed
    * @return {string}
    */
-  @CordovaProperty downlinkMax: string;
+  @CordovaProperty
+  downlinkMax: string;
 
   /**
    * Returns an observable to watch connection changes
@@ -92,9 +89,7 @@ export class Network extends IonicNativePlugin {
     eventObservable: true,
     event: 'offline'
   })
-  onDisconnect(): Observable<any> {
-    return;
-  }
+  onDisconnect(): Observable<any> { return; }
 
   /**
    * Get notified when the device goes online
@@ -104,7 +99,6 @@ export class Network extends IonicNativePlugin {
     eventObservable: true,
     event: 'online'
   })
-  onConnect(): Observable<any> {
-    return;
-  }
+  onConnect(): Observable<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/nfc/index.ts b/src/@ionic-native/plugins/nfc/index.ts
index 703e197d4..0d885f7e6 100644
--- a/src/@ionic-native/plugins/nfc/index.ts
+++ b/src/@ionic-native/plugins/nfc/index.ts
@@ -1,12 +1,6 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin, CordovaProperty } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
-
 declare let window: any;
 
 export interface NdefEvent {
@@ -73,8 +67,8 @@ export interface NdefTag {
   platforms: ['Android', 'BlackBerry 10', 'Windows', 'Windows Phone 8']
 })
 /**
- *@{ NFC } class methods
- */
+*@{ NFC } class methods
+*/
 @Injectable()
 export class NFC extends IonicNativePlugin {
   /**
@@ -90,9 +84,7 @@ export class NFC extends IonicNativePlugin {
     clearFunction: 'invalidateSession',
     clearWithArgs: true
   })
-  beginSession(onSuccess?: Function, onFailure?: Function): Observable<any> {
-    return;
-  }
+  beginSession(onSuccess?: Function, onFailure?: Function): Observable<any> { return; }
 
   /**
    * Registers an event listener for any NDEF tag.
@@ -107,12 +99,7 @@ export class NFC extends IonicNativePlugin {
     clearFunction: 'removeNdefListener',
     clearWithArgs: true
   })
-  addNdefListener(
-    onSuccess?: Function,
-    onFailure?: Function
-  ): Observable<NdefEvent> {
-    return;
-  }
+  addNdefListener(onSuccess?: Function, onFailure?: Function): Observable<NdefEvent> { return; }
 
   /**
    * Registers an event listener for tags matching any tag type.
@@ -127,12 +114,7 @@ export class NFC extends IonicNativePlugin {
     clearFunction: 'removeTagDiscoveredListener',
     clearWithArgs: true
   })
-  addTagDiscoveredListener(
-    onSuccess?: Function,
-    onFailure?: Function
-  ): Observable<any> {
-    return;
-  }
+  addTagDiscoveredListener(onSuccess?: Function, onFailure?: Function): Observable<any> { return; }
 
   /**
    * Registers an event listener for NDEF tags matching a specified MIME type.
@@ -148,13 +130,7 @@ export class NFC extends IonicNativePlugin {
     clearFunction: 'removeMimeTypeListener',
     clearWithArgs: true
   })
-  addMimeTypeListener(
-    mimeType: string,
-    onSuccess?: Function,
-    onFailure?: Function
-  ): Observable<any> {
-    return;
-  }
+  addMimeTypeListener(mimeType: string, onSuccess?: Function, onFailure?: Function): Observable<any> { return; }
 
   /**
    * Registers an event listener for formatable NDEF tags.
@@ -167,12 +143,7 @@ export class NFC extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 3
   })
-  addNdefFormatableListener(
-    onSuccess?: Function,
-    onFailure?: Function
-  ): Observable<any> {
-    return;
-  }
+  addNdefFormatableListener(onSuccess?: Function, onFailure?: Function): Observable<any> { return; }
 
   /**
    * Writes an NdefMessage(array of ndef records) to a NFC tag.
@@ -180,17 +151,13 @@ export class NFC extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  write(message: any[]): Promise<any> {
-    return;
-  }
+  write(message: any[]): Promise<any> { return; }
   /**
    * Makes a NFC tag read only. **Warning** this is permanent.
    * @returns {Promise<any>}
    */
   @Cordova()
-  makeReadyOnly(): Promise<any> {
-    return;
-  }
+  makeReadyOnly(): Promise<any> { return; }
 
   /**
    * Shares an NDEF Message(array of ndef records) via peer-to-peer.
@@ -198,26 +165,20 @@ export class NFC extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  share(message: any[]): Promise<any> {
-    return;
-  }
+  share(message: any[]): Promise<any> { return; }
 
   /**
    * Stop sharing NDEF data via peer-to-peer.
    * @returns {Promise<any>}
    */
   @Cordova()
-  unshare(): Promise<any> {
-    return;
-  }
+  unshare(): Promise<any> { return; }
 
   /**
    * Erase a NDEF tag
    */
   @Cordova()
-  erase(): Promise<any> {
-    return;
-  }
+  erase(): Promise<any> { return; }
 
   /**
    * Send a file to another device via NFC handover.
@@ -225,58 +186,46 @@ export class NFC extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  handover(uris: string[]): Promise<any> {
-    return;
-  }
+  handover(uris: string[]): Promise<any> { return; }
 
   /**
    * Stop sharing NDEF data via NFC handover.
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopHandover(): Promise<any> {
-    return;
-  }
+  stopHandover(): Promise<any> { return; }
 
   /**
    * Opens the device's NFC settings.
    * @returns {Promise<any>}
    */
   @Cordova()
-  showSettings(): Promise<any> {
-    return;
-  }
+  showSettings(): Promise<any> { return; }
 
   /**
    * Check if NFC is available and enabled on this device.
    * @returns {Promise<any>}
    */
   @Cordova()
-  enabled(): Promise<any> {
-    return;
-  }
+  enabled(): Promise<any> { return; }
   /**
-   * @{ NFC } class utility methods
-   * for use with
-   */
+  * @{ NFC } class utility methods
+  * for use with
+  */
   /**
    * Convert byte array to string
    * @param bytes {number[]}
    * @returns {string}
    */
   @Cordova({ sync: true })
-  bytesToString(bytes: number[]): string {
-    return;
-  }
+  bytesToString(bytes: number[]): string { return; }
   /**
    * Convert string to byte array.
    * @param str {string}
    * @returns {number[]}
    */
   @Cordova({ sync: true })
-  stringToBytes(str: string): number[] {
-    return;
-  }
+  stringToBytes(str: string): number[] { return; };
   /**
    * Convert byte array to hex string
    *
@@ -284,9 +233,8 @@ export class NFC extends IonicNativePlugin {
    * @returns {string}
    */
   @Cordova({ sync: true })
-  bytesToHexString(bytes: number[]): string {
-    return;
-  }
+  bytesToHexString(bytes: number[]): string { return; };
+
 }
 /**
  * @hidden
@@ -297,113 +245,92 @@ export class NFC extends IonicNativePlugin {
   pluginRef: 'ndef'
 })
 /**
- *@{ Ndef } class methods
- *@description
- * Utility methods for creating ndef records for the ndef tag format.
- * Move records into array before usage. Then pass an array to methods as parameters.
- * Do not pass bytes as parameters for these methods, conversion is built in.
- * For usage with nfc.write() and nfc.share()
- */
+*@{ Ndef } class methods
+*@description
+* Utility methods for creating ndef records for the ndef tag format.
+* Move records into array before usage. Then pass an array to methods as parameters.
+* Do not pass bytes as parameters for these methods, conversion is built in.
+* For usage with nfc.write() and nfc.share()
+*/
 @Injectable()
 export class Ndef extends IonicNativePlugin {
-  @CordovaProperty TNF_EMPTY: number;
-  @CordovaProperty TNF_WELL_KNOWN: number;
-  @CordovaProperty TNF_MIME_MEDIA: number;
-  @CordovaProperty TNF_ABSOLUTE_URI: number;
-  @CordovaProperty TNF_EXTERNAL_TYPE: number;
-  @CordovaProperty TNF_UNKNOWN: number;
-  @CordovaProperty TNF_UNCHANGED: number;
-  @CordovaProperty TNF_RESERVED: number;
 
-  @CordovaProperty RTD_TEXT: number[];
-  @CordovaProperty RTD_URI: number[];
-  @CordovaProperty RTD_SMART_POSTER: number[];
-  @CordovaProperty RTD_ALTERNATIVE_CARRIER: number[];
-  @CordovaProperty RTD_HANDOVER_CARRIER: number[];
-  @CordovaProperty RTD_HANDOVER_REQUEST: number[];
-  @CordovaProperty RTD_HANDOVER_SELECT: number[];
+  @CordovaProperty
+  TNF_EMPTY: number;
+  @CordovaProperty
+  TNF_WELL_KNOWN: number;
+  @CordovaProperty
+  TNF_MIME_MEDIA: number;
+  @CordovaProperty
+  TNF_ABSOLUTE_URI: number;
+  @CordovaProperty
+  TNF_EXTERNAL_TYPE: number;
+  @CordovaProperty
+  TNF_UNKNOWN: number;
+  @CordovaProperty
+  TNF_UNCHANGED: number;
+  @CordovaProperty
+  TNF_RESERVED: number;
+
+  @CordovaProperty
+  RTD_TEXT: number[];
+  @CordovaProperty
+  RTD_URI: number[];
+  @CordovaProperty
+  RTD_SMART_POSTER: number[];
+  @CordovaProperty
+  RTD_ALTERNATIVE_CARRIER: number[];
+  @CordovaProperty
+  RTD_HANDOVER_CARRIER: number[];
+  @CordovaProperty
+  RTD_HANDOVER_REQUEST: number[];
+  @CordovaProperty
+  RTD_HANDOVER_SELECT: number[];
 
   @Cordova({ sync: true })
-  record(
-    tnf: number,
-    type: number[] | string,
-    id: number[] | string,
-    payload: number[] | string
-  ): NdefRecord {
-    return;
-  }
+  record(tnf: number, type: number[] | string, id: number[] | string, payload: number[] | string): NdefRecord { return; }
 
   @Cordova({ sync: true })
-  textRecord(
-    text: string,
-    languageCode: string,
-    id: number[] | string
-  ): NdefRecord {
-    return;
-  }
+  textRecord(text: string, languageCode: string, id: number[] | string): NdefRecord { return; }
 
   @Cordova({ sync: true })
-  uriRecord(uri: string, id: number[] | string): NdefRecord {
-    return;
-  }
+  uriRecord(uri: string, id: number[] | string): NdefRecord { return; }
 
   @Cordova({ sync: true })
-  absoluteUriRecord(
-    uri: string,
-    payload: number[] | string,
-    id: number[] | string
-  ): NdefRecord {
-    return;
-  }
+  absoluteUriRecord(uri: string, payload: number[] | string, id: number[] | string): NdefRecord { return; }
 
   @Cordova({ sync: true })
-  mimeMediaRecord(mimeType: string, payload: string): NdefRecord {
-    return;
-  }
+  mimeMediaRecord(mimeType: string, payload: string): NdefRecord { return; }
 
   @Cordova({ sync: true })
-  smartPoster(ndefRecords: any[], id?: number[] | string): NdefRecord {
-    return;
-  }
+  smartPoster(ndefRecords: any[], id?: number[] | string ): NdefRecord { return; }
 
   @Cordova({ sync: true })
-  emptyRecord(): NdefRecord {
-    return;
-  }
+  emptyRecord(): NdefRecord { return; }
 
   @Cordova({ sync: true })
-  androidApplicationRecord(packageName: string): NdefRecord {
-    return;
-  }
+  androidApplicationRecord(packageName: string): NdefRecord { return; }
 
   @Cordova({ sync: true })
-  encodeMessage(ndefRecords: any): any {
-    return;
-  }
+  encodeMessage(ndefRecords: any): any { return; }
 
   @Cordova({ sync: true })
-  decodeMessage(bytes: any): any {
-    return;
-  }
+  decodeMessage(bytes: any): any { return; }
 
   @Cordova({ sync: true })
-  docodeTnf(tnf_byte: any): any {
-    return;
-  }
+  docodeTnf(tnf_byte: any): any { return; }
 
   @Cordova({ sync: true })
-  encodeTnf(mb: any, me: any, cf: any, sr: any, il: any, tnf: any): any {
-    return;
-  }
+  encodeTnf(mb: any, me: any, cf: any, sr: any, il: any, tnf: any): any { return; }
 
   @Cordova({ sync: true })
-  tnfToString(tnf: any): string {
-    return;
-  }
+  tnfToString(tnf: any): string { return; }
 
-  @CordovaProperty textHelper: TextHelper;
+  @CordovaProperty
+  textHelper: TextHelper;
 
-  @CordovaProperty uriHelper: UriHelper;
+  @CordovaProperty
+  uriHelper: UriHelper;
 }
 
 /**
@@ -416,51 +343,32 @@ export class Ndef extends IonicNativePlugin {
 })
 @Injectable()
 export class NfcUtil extends IonicNativePlugin {
-  @Cordova({ sync: true })
-  toHex(i: number): string {
-    return;
-  }
 
   @Cordova({ sync: true })
-  toPrintable(i: number): string {
-    return;
-  }
+  toHex(i: number): string { return; }
 
   @Cordova({ sync: true })
-  bytesToString(i: number[]): string {
-    return;
-  }
+  toPrintable(i: number): string { return; }
 
   @Cordova({ sync: true })
-  stringToBytes(s: string): number[] {
-    return;
-  }
+  bytesToString(i: number[]): string { return; }
 
   @Cordova({ sync: true })
-  bytesToHexString(bytes: number[]): string {
-    return;
-  }
+  stringToBytes(s: string): number[] { return; }
 
   @Cordova({ sync: true })
-  isType(record: NdefRecord, tnf: number, type: number[] | string): boolean {
-    return;
-  }
+  bytesToHexString(bytes: number[]): string { return; }
+
+  @Cordova({ sync: true })
+  isType(record: NdefRecord, tnf: number, type: number[]|string): boolean { return; }
 }
 
 export class TextHelper extends IonicNativePlugin {
-  decodePayload(data: number[]): string {
-    return;
-  }
-  encodePayload(text: string, lang: string): number[] {
-    return;
-  }
+  decodePayload(data: number[]): string { return; }
+  encodePayload(text: string, lang: string): number[] { return; }
 }
 
 export class UriHelper extends IonicNativePlugin {
-  decodePayload(data: number[]): string {
-    return;
-  }
-  encodePayload(uri: string): number[] {
-    return;
-  }
+  decodePayload(data: number[]): string { return; }
+  encodePayload(uri: string): number[] { return; }
 }
diff --git a/src/@ionic-native/plugins/onesignal/index.ts b/src/@ionic-native/plugins/onesignal/index.ts
index 28fbae8ed..a0e5de2af 100644
--- a/src/@ionic-native/plugins/onesignal/index.ts
+++ b/src/@ionic-native/plugins/onesignal/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface OSNotification {
diff --git a/src/@ionic-native/plugins/open-native-settings/index.ts b/src/@ionic-native/plugins/open-native-settings/index.ts
index 4e572143f..2d5e9c4ff 100644
--- a/src/@ionic-native/plugins/open-native-settings/index.ts
+++ b/src/@ionic-native/plugins/open-native-settings/index.ts
@@ -1,11 +1,11 @@
+import { Plugin, IonicNativePlugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Open Native Settings
  * @description
- * Plugin to open native screens of iOS/android settings
- * @usage
+ * Plugin to open native screens of iOS/android settings 
+ * @usage 
  * You can open any of these settings:
  * ```
  * "about", // ios
@@ -78,7 +78,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
     "wifi_ip", // android
     "wifi", // ios, android
     "wireless" // android
-    ```
+    ``` 
  * ```typescript
  * import { OpenNativeSettings } from '@ionic-native/open-native-settings';
  *
@@ -99,13 +99,13 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class OpenNativeSettings extends IonicNativePlugin {
+
   /**
    * Opens a setting dialog
    * @param setting {string} setting name
    * @return {Promise<any>}
    */
   @Cordova()
-  open(setting: string): Promise<any> {
-    return;
-  }
+  open(setting: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/paypal/index.ts b/src/@ionic-native/plugins/paypal/index.ts
index 433067dc4..497b980e1 100644
--- a/src/@ionic-native/plugins/paypal/index.ts
+++ b/src/@ionic-native/plugins/paypal/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name PayPal
@@ -78,9 +78,7 @@ export class PayPal extends IonicNativePlugin {
    * @returns {Promise<string>}
    */
   @Cordova()
-  version(): Promise<string> {
-    return;
-  }
+  version(): Promise<string> { return; }
 
   /**
    * You must preconnect to PayPal to prepare the device for processing payments.
@@ -92,9 +90,7 @@ export class PayPal extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  init(clientIdsForEnvironments: PayPalEnvironment): Promise<any> {
-    return;
-  }
+  init(clientIdsForEnvironments: PayPalEnvironment): Promise<any> { return; }
 
   /**
    * You must preconnect to PayPal to prepare the device for processing payments.
@@ -106,12 +102,7 @@ export class PayPal extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  prepareToRender(
-    environment: string,
-    configuration: PayPalConfiguration
-  ): Promise<any> {
-    return;
-  }
+  prepareToRender(environment: string, configuration: PayPalConfiguration): Promise<any> { return; }
 
   /**
    * Start PayPal UI to collect payment from the user.
@@ -122,9 +113,7 @@ export class PayPal extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  renderSinglePaymentUI(payment: PayPalPayment): Promise<any> {
-    return;
-  }
+  renderSinglePaymentUI(payment: PayPalPayment): Promise<any> { return; }
 
   /**
    * Once a user has consented to future payments, when the user subsequently initiates a PayPal payment
@@ -137,18 +126,14 @@ export class PayPal extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  clientMetadataID(): Promise<any> {
-    return;
-  }
+  clientMetadataID(): Promise<any> { return; }
 
   /**
    * Please Read Docs on Future Payments at https://github.com/paypal/PayPal-iOS-SDK#future-payments
    * @returns {Promise<any>}
    */
   @Cordova()
-  renderFuturePaymentUI(): Promise<any> {
-    return;
-  }
+  renderFuturePaymentUI(): Promise<any> { return; }
 
   /**
    * Please Read Docs on Profile Sharing at https://github.com/paypal/PayPal-iOS-SDK#profile-sharing
@@ -158,9 +143,7 @@ export class PayPal extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  renderProfileSharingUI(scopes: string[]): Promise<any> {
-    return;
-  }
+  renderProfileSharingUI(scopes: string[]): Promise<any> { return; }
 }
 
 export interface PayPalEnvironment {
@@ -172,13 +155,7 @@ export interface PayPalEnvironment {
  * @hidden
  */
 export class PayPalPayment {
-  constructor(
-    amount: string,
-    currency: string,
-    shortDescription: string,
-    intent: string,
-    details?: PayPalPaymentDetails
-  ) {
+  constructor(amount: string, currency: string, shortDescription: string, intent: string, details?: PayPalPaymentDetails) {
     this.amount = amount;
     this.currency = currency;
     this.shortDescription = shortDescription;
@@ -228,9 +205,9 @@ export class PayPalPayment {
   items: Array<PayPalItem>;
 
   /**
-   * Optional payee email, if your app is paying a third-party merchant.
-   * The payee's email. It must be a valid PayPal email address.
-   */
+  * Optional payee email, if your app is paying a third-party merchant.
+  * The payee's email. It must be a valid PayPal email address.
+  */
   payeeEmail: string;
 
   /**
@@ -258,13 +235,7 @@ export class PayPalItem {
    * @param {String} currency: ISO standard currency code.
    * @param {String} sku: The stock keeping unit for this item. 50 characters max (optional)
    */
-  constructor(
-    name: string,
-    quantity: number,
-    price: string,
-    currency: string,
-    sku?: string
-  ) {
+  constructor(name: string, quantity: number, price: string, currency: string, sku?: string) {
     this.name = name;
     this.quantity = quantity;
     this.price = price;
@@ -434,6 +405,7 @@ export class PayPalConfiguration implements PayPalConfigurationOptions {
    * see defaults for options available
    */
   constructor(options?: PayPalConfigurationOptions) {
+
     let defaults: PayPalConfigurationOptions = {
       defaultUserEmail: null,
       defaultUserPhoneCountryCode: null,
@@ -478,15 +450,7 @@ export class PayPalShippingAddress {
    * @param {String} postalCode: ZIP code or equivalent is usually required for countries that have them. 20 characters max. Required in certain countries.
    * @param {String} countryCode: 2-letter country code. 2 characters max.
    */
-  constructor(
-    recipientName: string,
-    line1: string,
-    line2: string,
-    city: string,
-    state: string,
-    postalCode: string,
-    countryCode: string
-  ) {
+  constructor(recipientName: string, line1: string, line2: string, city: string, state: string, postalCode: string, countryCode: string) {
     this.recipientName = recipientName;
     this.line1 = line1;
     this.line2 = line2;
diff --git a/src/@ionic-native/plugins/pedometer/index.ts b/src/@ionic-native/plugins/pedometer/index.ts
index f4e369167..773db656d 100644
--- a/src/@ionic-native/plugins/pedometer/index.ts
+++ b/src/@ionic-native/plugins/pedometer/index.ts
@@ -1,6 +1,6 @@
-import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
+import { Injectable } from '@angular/core';
 
 /**
  * Interface of a pedometer data object which is returned by watching for new data or by recieving historical data
@@ -43,14 +43,13 @@ export interface IPedometerData {
 })
 @Injectable()
 export class Pedometer extends IonicNativePlugin {
+
   /**
    * Checks if step counting is available. Only works on iOS.
    * @return {Promise<boolean>} Returns a promise that resolves when feature is supported (true) or not supported (false)
    */
   @Cordova()
-  isStepCountingAvailable(): Promise<boolean> {
-    return;
-  }
+  isStepCountingAvailable(): Promise<boolean> { return; }
 
   /**
    * Distance estimation indicates the ability to use step information to supply the approximate distance travelled by the user.
@@ -59,9 +58,7 @@ export class Pedometer extends IonicNativePlugin {
    * @return {Promise<boolean>} Returns a promise that resolves when feature is supported (true) or not supported (false)
    */
   @Cordova()
-  isDistanceAvailable(): Promise<boolean> {
-    return;
-  }
+  isDistanceAvailable(): Promise<boolean> { return; }
 
   /**
    * Floor counting indicates the ability to count the number of floors the user walks up or down using stairs.
@@ -70,33 +67,27 @@ export class Pedometer extends IonicNativePlugin {
    * @return {Promise<boolean>} Returns a promise that resolves when feature is supported (true) or not supported (false)
    */
   @Cordova()
-  isFloorCountingAvailable(): Promise<boolean> {
-    return;
-  }
+  isFloorCountingAvailable(): Promise<boolean> { return; }
 
   /**
-   * Starts the delivery of recent pedestrian-related data to your Cordova app.
-   *
-   * When the app is suspended, the delivery of updates stops temporarily.
-   * Upon returning to foreground or background execution, the pedometer object begins updates again.
-   * @return {Observable<IPedometerData>} Returns a Observable that recieves repeatly data from pedometer in background.
-   */
+  * Starts the delivery of recent pedestrian-related data to your Cordova app.
+  *
+  * When the app is suspended, the delivery of updates stops temporarily.
+  * Upon returning to foreground or background execution, the pedometer object begins updates again.
+  * @return {Observable<IPedometerData>} Returns a Observable that recieves repeatly data from pedometer in background.
+  */
   @Cordova({
     observable: true,
     clearFunction: 'stopPedometerUpdates'
   })
-  startPedometerUpdates(): Observable<IPedometerData> {
-    return;
-  }
+  startPedometerUpdates(): Observable<IPedometerData> { return; }
 
   /**
    * Stops the delivery of recent pedestrian data updates to your Cordova app.
    * @return {Promise<boolean>} Returns a promise that resolves when pedometer watching was stopped
    */
   @Cordova()
-  stopPedometerUpdates(): Promise<any> {
-    return;
-  }
+  stopPedometerUpdates(): Promise<any> { return; }
 
   /**
    * Retrieves the data between the specified start and end dates.
@@ -109,10 +100,6 @@ export class Pedometer extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  queryData(options: {
-    startDate: Date;
-    endDate: Date;
-  }): Promise<IPedometerData> {
-    return;
-  }
+  queryData(options: { startDate: Date, endDate: Date }): Promise<IPedometerData> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/phonegap-local-notification/index.ts b/src/@ionic-native/plugins/phonegap-local-notification/index.ts
index 797d9e909..50ec81749 100644
--- a/src/@ionic-native/plugins/phonegap-local-notification/index.ts
+++ b/src/@ionic-native/plugins/phonegap-local-notification/index.ts
@@ -1,11 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  checkAvailability,
-  Cordova,
-  CordovaInstance,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, CordovaInstance, Plugin, IonicNativePlugin, checkAvailability } from '@ionic-native/core';
 
 declare const Notification: any;
 
@@ -13,25 +7,22 @@ declare const Notification: any;
  * @hidden
  */
 export class PLNObject {
+
   private _objectInstance: any;
 
   constructor(title: string, options: LocalNotificationOptions) {
-    if (
-      checkAvailability(
-        PhonegapLocalNotification.pluginRef,
-        null,
-        PhonegapLocalNotification.pluginName
-      ) === true
-    ) {
+    if (checkAvailability(PhonegapLocalNotification.pluginRef, null, PhonegapLocalNotification.pluginName) === true) {
       this._objectInstance = new Notification(title, options);
     }
   }
 
   @CordovaInstance({ sync: true })
-  close(): void {}
+  close(): void { }
+
 }
 
 export interface LocalNotificationOptions {
+
   /**
    * Sets the direction of the notification. One of "auto", "ltr" or "rtl"
    */
@@ -56,6 +47,7 @@ export interface LocalNotificationOptions {
    * Sets the icon of the notification
    */
   icon?: string;
+
 }
 
 /**
@@ -102,22 +94,20 @@ export interface LocalNotificationOptions {
 })
 @Injectable()
 export class PhonegapLocalNotification extends IonicNativePlugin {
+
   /**
    * A global object that lets you interact with the Notification API.
    * @param title {string} Title of the local notification.
    * @param Options {LocalNotificationOptions} An object containing optional property/value pairs.
    * @returns {PLNObject}
    */
-  create(title: string, options: LocalNotificationOptions) {
-    return new PLNObject(title, options);
-  }
+  create(title: string, options: LocalNotificationOptions) { return new PLNObject(title, options); }
 
   /**
-   * requests permission from the user to show a local notification.
-   * @returns {Promise<any>}
-   */
+  * requests permission from the user to show a local notification.
+  * @returns {Promise<any>}
+  */
   @Cordova()
-  requestPermission(): Promise<any> {
-    return;
-  }
+  requestPermission(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/photo-library/index.ts b/src/@ionic-native/plugins/photo-library/index.ts
index 9f51214d4..3ca7cf3bd 100644
--- a/src/@ionic-native/plugins/photo-library/index.ts
+++ b/src/@ionic-native/plugins/photo-library/index.ts
@@ -1,13 +1,7 @@
-import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaOptions,
-  IonicNativePlugin,
-  Plugin,
-  wrap
-} from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin, CordovaOptions, wrap } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
+import { Injectable } from '@angular/core';
 
 /**
  * @hidden
@@ -28,22 +22,12 @@ export interface CordovaFiniteObservableOptions extends CordovaOptions {
  *
  * Wraps method that returns an observable that can be completed. Provided opts.resultFinalPredicate dictates when the observable completes.
  */
-export function CordovaFiniteObservable(
-  opts: CordovaFiniteObservableOptions = {}
-) {
+export function CordovaFiniteObservable(opts: CordovaFiniteObservableOptions = {}) {
   opts.observable = true;
-  return (
-    target: Object,
-    methodName: string,
-    descriptor: TypedPropertyDescriptor<any>
-  ) => {
+  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
     return {
       value: function(...args: any[]) {
-        const wrappedObservable: Observable<any> = wrap(
-          this,
-          methodName,
-          opts
-        ).apply(this, args);
+        const wrappedObservable: Observable<any> = wrap(this, methodName, opts).apply(this, args);
         return new Observable<any>((observer: Observer<any>) => {
           const wrappedSubscription = wrappedObservable.subscribe({
             next: (x: any) => {
@@ -52,12 +36,8 @@ export function CordovaFiniteObservable(
                 observer.complete();
               }
             },
-            error: (err: any) => {
-              observer.error(err);
-            },
-            complete: () => {
-              observer.complete();
-            }
+            error: (err: any) => { observer.error(err); },
+            complete: () => { observer.complete(); }
           });
           return () => {
             wrappedSubscription.unsubscribe();
@@ -111,13 +91,13 @@ export function CordovaFiniteObservable(
   plugin: 'cordova-plugin-photo-library',
   pluginRef: 'cordova.plugins.photoLibrary',
   repo: 'https://github.com/terikon/cordova-plugin-photo-library',
-  install:
-    'ionic cordova plugin add cordova-plugin-photo-library --variable PHOTO_LIBRARY_USAGE_DESCRIPTION="To choose photos"',
+  install: 'ionic cordova plugin add cordova-plugin-photo-library --variable PHOTO_LIBRARY_USAGE_DESCRIPTION="To choose photos"',
   installVariables: ['PHOTO_LIBRARY_USAGE_DESCRIPTION'],
   platforms: ['Android', 'Browser', 'iOS']
 })
 @Injectable()
 export class PhotoLibrary extends IonicNativePlugin {
+
   /**
    * Retrieves library items. Library item contains photo metadata like width and height, as well as photoURL and thumbnailURL.
    * @param options {GetLibraryOptions} Optional, like thumbnail size and chunks settings.
@@ -128,9 +108,7 @@ export class PhotoLibrary extends IonicNativePlugin {
     resultFinalPredicate: 'isLastChunk',
     resultTransform: 'library'
   })
-  getLibrary(options?: GetLibraryOptions): Observable<LibraryItem[]> {
-    return;
-  }
+  getLibrary(options?: GetLibraryOptions): Observable<LibraryItem[]> { return; }
 
   /**
    * Asks user permission to access photo library.
@@ -140,9 +118,7 @@ export class PhotoLibrary extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  requestAuthorization(options?: RequestAuthorizationOptions): Promise<void> {
-    return;
-  }
+  requestAuthorization(options?: RequestAuthorizationOptions): Promise<void> { return; }
 
   /**
    * Returns list of photo albums on device.
@@ -151,9 +127,7 @@ export class PhotoLibrary extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getAlbums(): Promise<AlbumItem[]> {
-    return;
-  }
+  getAlbums(): Promise<AlbumItem[]> { return; }
 
   /**
    * Provides means to request URL of thumbnail, with specified size or quality.
@@ -165,12 +139,7 @@ export class PhotoLibrary extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  getThumbnailURL(
-    photo: string | LibraryItem,
-    options?: GetThumbnailOptions
-  ): Promise<string> {
-    return;
-  }
+  getThumbnailURL(photo: string | LibraryItem, options?: GetThumbnailOptions): Promise<string> { return; }
 
   /**
    * Provides means to request photo URL by id.
@@ -182,9 +151,7 @@ export class PhotoLibrary extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  getPhotoURL(photo: string | LibraryItem, options?: any): Promise<string> {
-    return;
-  }
+  getPhotoURL(photo: string | LibraryItem, options?: any): Promise<string> { return; }
 
   /**
    * Returns thumbnail as Blob.
@@ -196,12 +163,7 @@ export class PhotoLibrary extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  getThumbnail(
-    photo: string | LibraryItem,
-    options?: GetThumbnailOptions
-  ): Promise<Blob> {
-    return;
-  }
+  getThumbnail(photo: string | LibraryItem, options?: GetThumbnailOptions): Promise<Blob> { return; }
 
   /**
    * Returns photo as Blob.
@@ -213,9 +175,7 @@ export class PhotoLibrary extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  getPhoto(photo: string | LibraryItem, options?: any): Promise<Blob> {
-    return;
-  }
+  getPhoto(photo: string | LibraryItem, options?: any): Promise<Blob> { return; }
 
   /**
    * Saves image to specified album. Album will be created if not exists.
@@ -229,13 +189,7 @@ export class PhotoLibrary extends IonicNativePlugin {
     successIndex: 2,
     errorIndex: 3
   })
-  saveImage(
-    url: string,
-    album: AlbumItem | string,
-    options?: GetThumbnailOptions
-  ): Promise<LibraryItem> {
-    return;
-  }
+  saveImage(url: string, album: AlbumItem | string, options?: GetThumbnailOptions): Promise<LibraryItem> { return; }
 
   /**
    * Saves video to specified album. Album will be created if not exists.
@@ -247,9 +201,8 @@ export class PhotoLibrary extends IonicNativePlugin {
     successIndex: 2,
     errorIndex: 3
   })
-  saveVideo(url: string, album: AlbumItem | string): Promise<void> {
-    return;
-  }
+  saveVideo(url: string, album: AlbumItem | string): Promise<void> { return; }
+
 }
 
 /**
diff --git a/src/@ionic-native/plugins/photo-viewer/index.ts b/src/@ionic-native/plugins/photo-viewer/index.ts
index acdbed769..5c4481d05 100644
--- a/src/@ionic-native/plugins/photo-viewer/index.ts
+++ b/src/@ionic-native/plugins/photo-viewer/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface PhotoViewerOptions {
   /**
@@ -39,6 +39,6 @@ export class PhotoViewer extends IonicNativePlugin {
    * @param title {string}
    * @param options {PhotoViewerOptions}
    */
-  @Cordova({ sync: true })
-  show(url: string, title?: string, options?: PhotoViewerOptions): void {}
+  @Cordova({sync: true})
+  show(url: string, title?: string, options?: PhotoViewerOptions): void { }
 }
diff --git a/src/@ionic-native/plugins/pin-check/index.ts b/src/@ionic-native/plugins/pin-check/index.ts
index e7eb75bd6..48b5098bc 100644
--- a/src/@ionic-native/plugins/pin-check/index.ts
+++ b/src/@ionic-native/plugins/pin-check/index.ts
@@ -1,8 +1,8 @@
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
- * @name Pin Check
+ * @name Pin Check 
  * @description
  * This plugin is for use with Apache Cordova and allows your application to check whether pin/keyguard or passcode is setup on iOS and Android phones.
  *
@@ -34,7 +34,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 @Injectable()
 export class PinCheck extends IonicNativePlugin {
   /**
-   *  check whether pin/keyguard or passcode is setup
+   *  check whether pin/keyguard or passcode is setup    
    * @returns {Promise<boolean>}
    */
   @Cordova()
diff --git a/src/@ionic-native/plugins/pin-dialog/index.ts b/src/@ionic-native/plugins/pin-dialog/index.ts
index 2a8e67653..d93e4b984 100644
--- a/src/@ionic-native/plugins/pin-dialog/index.ts
+++ b/src/@ionic-native/plugins/pin-dialog/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name Pin Dialog
@@ -43,11 +44,6 @@ export class PinDialog extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 4 // no error callback
   })
-  prompt(
-    message: string,
-    title: string,
-    buttons: string[]
-  ): Promise<{ buttonIndex: number; input1: string }> {
-    return;
-  }
+  prompt(message: string, title: string, buttons: string[]): Promise<{ buttonIndex: number, input1: string }> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/pinterest/index.ts b/src/@ionic-native/plugins/pinterest/index.ts
index 81e358e98..7b6ffc804 100644
--- a/src/@ionic-native/plugins/pinterest/index.ts
+++ b/src/@ionic-native/plugins/pinterest/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Plugin, Cordova, CordovaProperty, IonicNativePlugin } from '@ionic-native/core';
 
 export interface PinterestUser {
   /**
@@ -177,13 +172,13 @@ export interface PinterestPin {
   plugin: 'cordova-plugin-pinterest',
   pluginRef: 'cordova.plugins.Pinterest',
   repo: 'https://github.com/zyramedia/cordova-plugin-pinterest',
-  install:
-    'ionic cordova plugin add cordova-plugin-pinterest --variable APP_ID=YOUR_APP_ID',
+  install: 'ionic cordova plugin add cordova-plugin-pinterest --variable APP_ID=YOUR_APP_ID',
   installVariables: ['APP_ID'],
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class Pinterest extends IonicNativePlugin {
+
   /**
    * Convenience constant for authentication scopes
    */
@@ -201,9 +196,7 @@ export class Pinterest extends IonicNativePlugin {
    * @returns {Promise<any>} The response object will contain the user's profile data, as well as the access token (if you need to use it elsewhere, example: send it to your server and perform actions on behalf of the user).
    */
   @Cordova()
-  login(scopes: string[]): Promise<any> {
-    return;
-  }
+  login(scopes: string[]): Promise<any> { return; }
 
   /**
    * Gets the authenticated user's profile
@@ -213,9 +206,7 @@ export class Pinterest extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getMe(fields?: string): Promise<PinterestUser> {
-    return;
-  }
+  getMe(fields?: string): Promise<PinterestUser> { return; }
 
   /**
    *
@@ -226,9 +217,7 @@ export class Pinterest extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getMyPins(fields?: string, limit?: number): Promise<Array<PinterestPin>> {
-    return;
-  }
+  getMyPins(fields?: string, limit?: number): Promise<Array<PinterestPin>> { return; }
 
   /**
    *
@@ -239,9 +228,7 @@ export class Pinterest extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getMyBoards(fields?: string, limit?: number): Promise<Array<PinterestBoard>> {
-    return;
-  }
+  getMyBoards(fields?: string, limit?: number): Promise<Array<PinterestBoard>> { return; }
 
   /**
    * Get the authenticated user's likes.
@@ -252,9 +239,7 @@ export class Pinterest extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getMyLikes(fields?: string, limit?: number): Promise<Array<PinterestPin>> {
-    return;
-  }
+  getMyLikes(fields?: string, limit?: number): Promise<Array<PinterestPin>> { return; }
 
   /**
    * Get the authenticated user's followers.
@@ -265,12 +250,7 @@ export class Pinterest extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getMyFollowers(
-    fields?: string,
-    limit?: number
-  ): Promise<Array<PinterestUser>> {
-    return;
-  }
+  getMyFollowers(fields?: string, limit?: number): Promise<Array<PinterestUser>> { return; }
 
   /**
    * Get the authenticated user's followed boards.
@@ -281,12 +261,7 @@ export class Pinterest extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getMyFollowedBoards(
-    fields?: string,
-    limit?: number
-  ): Promise<Array<PinterestBoard>> {
-    return;
-  }
+  getMyFollowedBoards(fields?: string, limit?: number): Promise<Array<PinterestBoard>> { return; }
 
   /**
    * Get the authenticated user's followed interests.
@@ -297,9 +272,7 @@ export class Pinterest extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getMyFollowedInterests(fields?: string, limit?: number): Promise<any> {
-    return;
-  }
+  getMyFollowedInterests(fields?: string, limit?: number): Promise<any> { return; }
 
   /**
    * Get a user's profile.
@@ -311,9 +284,7 @@ export class Pinterest extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  getUser(username: string, fields?: string): Promise<PinterestUser> {
-    return;
-  }
+  getUser(username: string, fields?: string): Promise<PinterestUser> { return; }
 
   /**
    * Get a board's data.
@@ -325,9 +296,7 @@ export class Pinterest extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  getBoard(boardId: string, fields?: string): Promise<PinterestBoard> {
-    return;
-  }
+  getBoard(boardId: string, fields?: string): Promise<PinterestBoard> { return; }
 
   /**
    * Get Pins of a specific board.
@@ -340,13 +309,7 @@ export class Pinterest extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  getBoardPins(
-    boardId: string,
-    fields?: string,
-    limit?: number
-  ): Promise<Array<PinterestPin>> {
-    return;
-  }
+  getBoardPins(boardId: string, fields?: string, limit?: number): Promise<Array<PinterestPin>> { return; }
 
   /**
    * Delete a board.
@@ -354,9 +317,7 @@ export class Pinterest extends IonicNativePlugin {
    * @returns {Promise<PinterestUser>}
    */
   @Cordova()
-  deleteBoard(boardId: string): Promise<any> {
-    return;
-  }
+  deleteBoard(boardId: string): Promise<any> { return; }
 
   /**
    * Create a new board for the authenticated user.
@@ -368,9 +329,7 @@ export class Pinterest extends IonicNativePlugin {
     successIndex: 2,
     errorIndex: 3
   })
-  createBoard(name: string, desc?: string): Promise<PinterestBoard> {
-    return;
-  }
+  createBoard(name: string, desc?: string): Promise<PinterestBoard> { return; }
 
   /**
    * Get a Pin by ID.
@@ -382,9 +341,7 @@ export class Pinterest extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  getPin(pinId: string, fields?: string): Promise<PinterestPin> {
-    return;
-  }
+  getPin(pinId: string, fields?: string): Promise<PinterestPin> { return; }
 
   /**
    * Deletes a pin
@@ -392,9 +349,7 @@ export class Pinterest extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  deletePin(pinId: string): Promise<any> {
-    return;
-  }
+  deletePin(pinId: string): Promise<any> { return; }
 
   /**
    * Creates a Pin
@@ -408,12 +363,6 @@ export class Pinterest extends IonicNativePlugin {
     successIndex: 4,
     errorIndex: 5
   })
-  createPin(
-    note: string,
-    boardId: string,
-    imageUrl: string,
-    link?: string
-  ): Promise<PinterestPin> {
-    return;
-  }
+  createPin(note: string, boardId: string, imageUrl: string, link?: string): Promise<PinterestPin> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/power-management/index.ts b/src/@ionic-native/plugins/power-management/index.ts
index a429c9318..ecd86188e 100644
--- a/src/@ionic-native/plugins/power-management/index.ts
+++ b/src/@ionic-native/plugins/power-management/index.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 /**
  * @name Power Management
  * @description
@@ -35,27 +34,21 @@ export class PowerManagement extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  acquire(): Promise<any> {
-    return;
-  }
+  acquire(): Promise<any> { return; }
 
   /**
    * This acquires a partial wakelock, allowing the screen to be dimmed.
    * @returns {Promise<any>}
    */
   @Cordova()
-  dim(): Promise<any> {
-    return;
-  }
+  dim(): Promise<any> { return; }
 
   /**
    * Release the wakelock. It's important to do this when you're finished with the wakelock, to avoid unnecessary battery drain.
    * @returns {Promise<any>}
    */
   @Cordova()
-  release(): Promise<any> {
-    return;
-  }
+  release(): Promise<any> { return; }
 
   /**
    * By default, the plugin will automatically release a wakelock when your app is paused (e.g. when the screen is turned off, or the user switches to another app).
@@ -64,7 +57,5 @@ export class PowerManagement extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  setReleaseOnPause(set: boolean): Promise<any> {
-    return;
-  }
+  setReleaseOnPause(set: boolean): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/printer/index.ts b/src/@ionic-native/plugins/printer/index.ts
index 64d3f6453..bffe3f474 100644
--- a/src/@ionic-native/plugins/printer/index.ts
+++ b/src/@ionic-native/plugins/printer/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, CordovaCheck, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface PrintOptions {
   /**
@@ -79,12 +74,14 @@ export interface PrintOptions {
 })
 @Injectable()
 export class Printer extends IonicNativePlugin {
+
   /**
    * Checks whether the device is capable of printing (uses `check()` internally)
    * @returns {Promise<boolean>}
    */
   isAvailable(): Promise<boolean> {
-    return this.check().then((res: any) => Promise.resolve(res.avail));
+    return this.check()
+      .then((res: any) => Promise.resolve(res.avail));
   }
 
   /**
@@ -94,9 +91,10 @@ export class Printer extends IonicNativePlugin {
   @CordovaCheck()
   check(): Promise<any> {
     return new Promise<any>((resolve: Function) => {
-      Printer.getPlugin().check((avail: boolean, count: any) => {
-        resolve({ avail, count });
-      });
+      Printer.getPlugin()
+        .check((avail: boolean, count: any) => {
+          resolve({ avail, count });
+        });
     });
   }
 
@@ -105,9 +103,7 @@ export class Printer extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  pick(): Promise<any> {
-    return;
-  }
+  pick(): Promise<any> { return; }
 
   /**
    * Sends content to the printer.
@@ -119,7 +115,6 @@ export class Printer extends IonicNativePlugin {
     successIndex: 2,
     errorIndex: 4
   })
-  print(content: string | HTMLElement, options?: PrintOptions): Promise<any> {
-    return;
-  }
+  print(content: string | HTMLElement, options?: PrintOptions): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/pro/index.ts b/src/@ionic-native/plugins/pro/index.ts
index c2da879cf..f11477798 100644
--- a/src/@ionic-native/plugins/pro/index.ts
+++ b/src/@ionic-native/plugins/pro/index.ts
@@ -1,11 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaCheck,
-  CordovaInstance,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Plugin, Cordova, CordovaCheck, CordovaInstance, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -41,25 +35,22 @@ export interface DeployConfig {
  * @hidden
  */
 export class ProDeploy {
-  constructor(private _objectInstance: any) {}
+
+  constructor(private _objectInstance: any) { }
 
   /**
    * Re-initialize Deploy plugin with a new App ID and host.  Not used in most cases.
    * @param config A valid Deploy config object
    */
   @CordovaInstance()
-  init(config: DeployConfig): Promise<any> {
-    return;
-  }
+  init(config: DeployConfig): Promise<any> { return; }
 
   /**
    * Check a channel for an available update
    * @return {Promise<string>} Resolves with 'true' or 'false', or rejects with an error.
    */
   @CordovaInstance()
-  check(): Promise<string> {
-    return;
-  }
+  check(): Promise<string> { return; }
 
   /**
    * Download an available version
@@ -68,9 +59,7 @@ export class ProDeploy {
   @CordovaInstance({
     observable: true
   })
-  download(): Observable<any> {
-    return;
-  }
+  download(): Observable<any> { return; }
 
   /**
    * Unzip the latest downloaded version
@@ -79,43 +68,33 @@ export class ProDeploy {
   @CordovaInstance({
     observable: true
   })
-  extract(): Observable<any> {
-    return;
-  }
+  extract(): Observable<any> { return; }
 
   /**
    * Reload app with the deployed version
    */
   @CordovaInstance()
-  redirect(): Promise<any> {
-    return;
-  }
+  redirect(): Promise<any> { return; }
 
   /**
    * Get info about the version running on the device
    * @return {Promise<DeployInfo>} Information about the current version running on the app.
    */
   @CordovaInstance()
-  info(): Promise<DeployInfo> {
-    return;
-  }
+  info(): Promise<DeployInfo> { return; }
 
   /**
    * List versions stored on the device
    */
   @CordovaInstance()
-  getVersions(): Promise<any> {
-    return;
-  }
+  getVersions(): Promise<any> { return; }
 
   /**
    * Delete a version stored on the device by UUID
    * @param version A version UUID
    */
   @CordovaInstance()
-  deleteVersion(version: string): Promise<any> {
-    return;
-  }
+  deleteVersion(version: string): Promise<any> { return; }
 }
 
 /**
@@ -129,17 +108,17 @@ export class ProDeploy {
  *
  *
  * constructor(private pro: Pro) { }
- *
+ * 
  * // Get app info
  * this.pro.getAppInfo().then((res: AppInfo) => {
  *   console.log(res)
  * })
- *
+ * 
  * // Get live update info
  * this.pro.deploy.info().then((res: DeployInfo) => {
  *   console.log(res)
  * })
- * ```
+ * ``` 
  */
 @Plugin({
   pluginName: 'Pro',
@@ -147,8 +126,7 @@ export class ProDeploy {
   pluginRef: 'IonicCordova',
   repo: 'https://github.com/ionic-team/cordova-plugin-ionic',
   platforms: ['Android', 'iOS'],
-  install:
-    'ionic cordova plugin add cordova-plugin-ionic --save --variable APP_ID="XXXXXXXX" --variable CHANNEL_NAME="Channel"'
+  install: 'ionic cordova plugin add cordova-plugin-ionic --save --variable APP_ID="XXXXXXXX" --variable CHANNEL_NAME="Channel"'
 })
 @Injectable()
 export class Pro extends IonicNativePlugin {
@@ -172,43 +150,34 @@ export class Pro extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when something happens
    */
   @Cordova()
-  enableCrashLogging(): Promise<any> {
-    return;
-  }
+  enableCrashLogging(): Promise<any> { return; }
 
   /**
    * Not yet implemented
    * @return {Promise<any>} Returns a promise that resolves when something happens
    */
   @Cordova()
-  checkForPendingCrash(): Promise<any> {
-    return;
-  }
+  checkForPendingCrash(): Promise<any> { return; }
 
   /**
    * Not yet implemented
    * @return {Promise<any>} Returns a promise that resolves when something happens
    */
   @Cordova()
-  loadPendingCrash(): Promise<any> {
-    return;
-  }
+  loadPendingCrash(): Promise<any> { return; }
 
   /**
    * Not yet implemented
    * @return {Promise<any>} Returns a promise that resolves when something happens
    */
   @Cordova()
-  forceCrash(): Promise<any> {
-    return;
-  }
+  forceCrash(): Promise<any> { return; }
 
   /**
    * Get information about the currently running app
    * @return {Promise<any>} Returns a promise that resolves with current app info
    */
   @Cordova()
-  getAppInfo(): Promise<AppInfo> {
-    return;
-  }
+  getAppInfo(): Promise<AppInfo> { return; }
 }
+
diff --git a/src/@ionic-native/plugins/push/index.ts b/src/@ionic-native/plugins/push/index.ts
index 542a6b540..b58cfbadb 100644
--- a/src/@ionic-native/plugins/push/index.ts
+++ b/src/@ionic-native/plugins/push/index.ts
@@ -1,18 +1,10 @@
 import { Injectable } from '@angular/core';
-import {
-  checkAvailability,
-  Cordova,
-  CordovaInstance,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, Plugin, CordovaInstance, checkAvailability, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare const window: any;
 
-export type EventResponse = RegistrationEventResponse &
-  NotificationEventResponse &
-  Error;
+export type EventResponse = RegistrationEventResponse & NotificationEventResponse & Error;
 
 export interface RegistrationEventResponse {
   /**
@@ -21,6 +13,7 @@ export interface RegistrationEventResponse {
   registrationId: string;
 }
 
+
 export interface NotificationEventResponse {
   /**
    * The text of the push message sent from the 3rd party service.
@@ -210,6 +203,7 @@ export interface BrowserPushOptions {
    * Default: http://push.api.phonegap.com/v1/push	Optional.
    */
   pushServiceURL?: string;
+
 }
 
 export interface PushOptions {
@@ -319,6 +313,7 @@ export type PushEvent = string;
 })
 @Injectable()
 export class Push extends IonicNativePlugin {
+
   /**
    * Init push notifications
    * @param options {PushOptions}
@@ -333,36 +328,29 @@ export class Push extends IonicNativePlugin {
    * @return {Promise<{isEnabled: boolean}>} Returns a Promise that resolves with an object with one property: isEnabled, a boolean that indicates if permission has been granted.
    */
   @Cordova()
-  hasPermission(): Promise<{ isEnabled: boolean }> {
-    return;
-  }
+  hasPermission(): Promise<{ isEnabled: boolean }> { return; }
 
   /**
    * Create a new notification channel for Android O and above.
    * @param channel {Channel}
    */
   @Cordova()
-  createChannel(channel: Channel): Promise<any> {
-    return;
-  }
+  createChannel(channel: Channel): Promise<any> { return; }
 
   /**
    * Delete a notification channel for Android O and above.
    * @param id
    */
   @Cordova()
-  deleteChannel(id: string): Promise<any> {
-    return;
-  }
+  deleteChannel(id: string): Promise<any> { return; }
 
   /**
    * Returns a list of currently configured channels.
    * @return {Promise<Channel[]>}
    */
   @Cordova()
-  listChannels(): Promise<Channel[]> {
-    return;
-  }
+  listChannels(): Promise<Channel[]> { return; }
+
 }
 
 /**
@@ -374,12 +362,11 @@ export class Push extends IonicNativePlugin {
   pluginRef: 'PushNotification'
 })
 export class PushObject {
+
   private _objectInstance: any;
 
   constructor(options: PushOptions) {
-    if (
-      checkAvailability('PushNotification', 'init', 'PushNotification') === true
-    ) {
+    if (checkAvailability('PushNotification', 'init', 'PushNotification') === true) {
       this._objectInstance = window.PushNotification.init(options);
     }
   }
@@ -394,9 +381,7 @@ export class PushObject {
     clearFunction: 'off',
     clearWithArgs: true
   })
-  on(event: PushEvent): Observable<EventResponse> {
-    return;
-  }
+  on(event: PushEvent): Observable<EventResponse> { return; }
 
   /**
    * The unregister method is used when the application no longer wants to receive push notifications.
@@ -404,9 +389,7 @@ export class PushObject {
    * so you will need to re-register them if you want them to function again without an application reload.
    */
   @CordovaInstance()
-  unregister(): Promise<any> {
-    return;
-  }
+  unregister(): Promise<any> { return; }
 
   /**
    * Set the badge count visible when the app is not running
@@ -419,17 +402,13 @@ export class PushObject {
   @CordovaInstance({
     callbackOrder: 'reverse'
   })
-  setApplicationIconBadgeNumber(count?: number): Promise<any> {
-    return;
-  }
+  setApplicationIconBadgeNumber(count?: number): Promise<any> { return; };
   /**
    * Get the current badge count visible when the app is not running
    * successHandler gets called with an integer which is the current badge count
    */
   @CordovaInstance()
-  getApplicationIconBadgeNumber(): Promise<number> {
-    return;
-  }
+  getApplicationIconBadgeNumber(): Promise<number> { return; }
 
   /**
    * iOS only
@@ -440,17 +419,13 @@ export class PushObject {
   @CordovaInstance({
     callbackOrder: 'reverse'
   })
-  finish(id?: string): Promise<any> {
-    return;
-  }
+  finish(id?: string): Promise<any> { return; }
 
   /**
    * Tells the OS to clear all notifications from the Notification Center
    */
   @CordovaInstance()
-  clearAllNotifications(): Promise<any> {
-    return;
-  }
+  clearAllNotifications(): Promise<any> { return; }
 
   /**
    * The subscribe method is used when the application wants to subscribe a new topic to receive push notifications.
@@ -458,9 +433,7 @@ export class PushObject {
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  subscribe(topic: string): Promise<any> {
-    return;
-  }
+  subscribe(topic: string): Promise<any> { return; }
 
   /**
    * The unsubscribe method is used when the application no longer wants to receive push notifications from a specific topic but continue to receive other push messages.
@@ -468,7 +441,6 @@ export class PushObject {
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  unsubscribe(topic: string): Promise<any> {
-    return;
-  }
+  unsubscribe(topic: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/qqsdk/index.ts b/src/@ionic-native/plugins/qqsdk/index.ts
index dabc73583..11cf5dace 100644
--- a/src/@ionic-native/plugins/qqsdk/index.ts
+++ b/src/@ionic-native/plugins/qqsdk/index.ts
@@ -1,7 +1,8 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface QQShareOptions {
+
   /**
    * The clinet type, QQ or TIM
    * Default is QQ
@@ -157,12 +158,12 @@ export interface QQShareOptions {
   pluginRef: 'QQSDK',
   repo: 'https://github.com/iVanPan/Cordova_QQ',
   platforms: ['Android', 'iOS'],
-  install:
-    'ionic cordova plugin add cordova-plugin-qqsdk --variable QQ_APP_ID=YOUR_QQ_APPID',
-  installVariables: ['QQ_APP_ID']
+  install: 'ionic cordova plugin add cordova-plugin-qqsdk --variable QQ_APP_ID=YOUR_QQ_APPID',
+  installVariables: ['QQ_APP_ID'],
 })
 @Injectable()
 export class QQSDK extends IonicNativePlugin {
+
   /**
    * QQ Share Scene
    */
diff --git a/src/@ionic-native/plugins/qr-scanner/index.ts b/src/@ionic-native/plugins/qr-scanner/index.ts
index 7cf121571..da96e1ea4 100644
--- a/src/@ionic-native/plugins/qr-scanner/index.ts
+++ b/src/@ionic-native/plugins/qr-scanner/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, IonicNativePlugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface QRScannerStatus {
@@ -115,6 +115,7 @@ export interface QRScannerStatus {
 })
 @Injectable()
 export class QRScanner extends IonicNativePlugin {
+
   /**
    * Request permission to use QR scanner.
    * @return {Promise<QRScannerStatus>}
@@ -122,9 +123,7 @@ export class QRScanner extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  prepare(): Promise<QRScannerStatus> {
-    return;
-  }
+  prepare(): Promise<QRScannerStatus> { return; }
 
   /**
    * Call this method to enable scanning. You must then call the `show` method to make the camera preview visible.
@@ -135,27 +134,21 @@ export class QRScanner extends IonicNativePlugin {
     observable: true,
     clearFunction: 'cancelScan'
   })
-  scan(): Observable<string> {
-    return;
-  }
+  scan(): Observable<string> { return; }
 
   /**
    * Configures the native webview to have a transparent background, then sets the background of the <body> and <html> DOM elements to transparent, allowing the webview to re-render with the transparent background.
    * @returns {Promise<QRScannerStatus>}
    */
   @Cordova()
-  show(): Promise<QRScannerStatus> {
-    return;
-  }
+  show(): Promise<QRScannerStatus> { return; }
 
   /**
    * Configures the native webview to be opaque with a white background, covering the video preview.
    * @returns {Promise<QRScannerStatus>}
    */
   @Cordova()
-  hide(): Promise<QRScannerStatus> {
-    return;
-  }
+  hide(): Promise<QRScannerStatus> { return; }
 
   /**
    * Enable the device's light (for scanning in low-light environments).
@@ -164,18 +157,14 @@ export class QRScanner extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  enableLight(): Promise<QRScannerStatus> {
-    return;
-  }
+  enableLight(): Promise<QRScannerStatus> { return; }
 
   /**
    * Destroy the scanner instance.
    * @returns {Promise<QRScannerStatus>}
    */
   @Cordova()
-  destroy(): Promise<QRScannerStatus> {
-    return;
-  }
+  destroy(): Promise<QRScannerStatus> { return; }
 
   /**
    * Disable the device's light.
@@ -184,9 +173,7 @@ export class QRScanner extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  disableLight(): Promise<QRScannerStatus> {
-    return;
-  }
+  disableLight(): Promise<QRScannerStatus> { return; }
 
   /**
    * Use front camera
@@ -195,9 +182,7 @@ export class QRScanner extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  useFrontCamera(): Promise<QRScannerStatus> {
-    return;
-  }
+  useFrontCamera(): Promise<QRScannerStatus> { return; }
 
   /**
    * Use back camera
@@ -206,9 +191,7 @@ export class QRScanner extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  useBackCamera(): Promise<QRScannerStatus> {
-    return;
-  }
+  useBackCamera(): Promise<QRScannerStatus> { return; }
 
   /**
    * Set camera to be used.
@@ -218,36 +201,28 @@ export class QRScanner extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  useCamera(camera: number): Promise<QRScannerStatus> {
-    return;
-  }
+  useCamera(camera: number): Promise<QRScannerStatus> { return; }
 
   /**
    * Pauses the video preview on the current frame and pauses scanning.
    * @return {Promise<QRScannerStatus>}
    */
   @Cordova()
-  pausePreview(): Promise<QRScannerStatus> {
-    return;
-  }
+  pausePreview(): Promise<QRScannerStatus> { return; }
 
   /**
    * Resumse the video preview and resumes scanning.
    * @return {Promise<QRScannerStatus>}
    */
   @Cordova()
-  resumePreview(): Promise<QRScannerStatus> {
-    return;
-  }
+  resumePreview(): Promise<QRScannerStatus> { return; }
 
   /**
    * Returns permission status
    * @return {Promise<QRScannerStatus>}
    */
   @Cordova()
-  getStatus(): Promise<QRScannerStatus> {
-    return;
-  }
+  getStatus(): Promise<QRScannerStatus> { return; }
 
   /**
    * Opens settings to edit app permissions.
@@ -256,4 +231,5 @@ export class QRScanner extends IonicNativePlugin {
     sync: true
   })
   openSettings(): void {}
+
 }
diff --git a/src/@ionic-native/plugins/regula-document-reader/index.ts b/src/@ionic-native/plugins/regula-document-reader/index.ts
index 7094c5f68..1628b8f9e 100644
--- a/src/@ionic-native/plugins/regula-document-reader/index.ts
+++ b/src/@ionic-native/plugins/regula-document-reader/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @paid
@@ -25,11 +25,11 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   pluginRef: 'DocumentReader',
   repo: 'https://github.com/regulaforensics/cordova-plugin-documentreader.git',
   platforms: ['iOS', 'Android'],
-  install:
-    'ionic plugin add cordova-plugin-documentreader --variable CAMERA_USAGE_DESCRIPTION="To take photo"'
+  install: 'ionic plugin add cordova-plugin-documentreader --variable CAMERA_USAGE_DESCRIPTION="To take photo"',
 })
 @Injectable()
 export class RegulaDocumentReader extends IonicNativePlugin {
+
   /**
    * Initialize the scanner
    * @param license {any} License data
@@ -42,7 +42,5 @@ export class RegulaDocumentReader extends IonicNativePlugin {
    * @return {Promise<string[]>} Returns a promise that resolves when results was got, and fails when not
    */
   @Cordova()
-  scanDocument(): Promise<string[]> {
-    return;
-  }
+  scanDocument(): Promise<string[]> { return; }
 }
diff --git a/src/@ionic-native/plugins/rollbar/index.ts b/src/@ionic-native/plugins/rollbar/index.ts
index 6ac19991b..65f8172db 100644
--- a/src/@ionic-native/plugins/rollbar/index.ts
+++ b/src/@ionic-native/plugins/rollbar/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @beta
@@ -24,19 +24,18 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   plugin: 'resgrid-cordova-plugins-rollbar',
   pluginRef: 'cordova.plugins.Rollbar',
   repo: 'https://github.com/Resgrid/cordova-plugins-rollbar',
-  install:
-    'ionic cordova plugin add resgrid-cordova-plugins-rollbar --variable ROLLBAR_ACCESS_TOKEN="YOUR_ROLLBAR_ACCEESS_TOKEN" --variable ROLLBAR_ENVIRONMENT="ROLLBAR_ENVIRONMENT"',
+  install: 'ionic cordova plugin add resgrid-cordova-plugins-rollbar --variable ROLLBAR_ACCESS_TOKEN="YOUR_ROLLBAR_ACCEESS_TOKEN" --variable ROLLBAR_ENVIRONMENT="ROLLBAR_ENVIRONMENT"',
   installVariables: ['ROLLBAR_ACCESS_TOKEN', 'ROLLBAR_ENVIRONMENT'],
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class Rollbar extends IonicNativePlugin {
+
   /**
    * This function initializes the monitoring of your application
    * @return {Promise<any>} Returns a promise that resolves when the plugin successfully initializes
    */
   @Cordova()
-  init(): Promise<any> {
-    return;
-  }
+  init(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/safari-view-controller/index.ts b/src/@ionic-native/plugins/safari-view-controller/index.ts
index e3d411919..a4eba210c 100644
--- a/src/@ionic-native/plugins/safari-view-controller/index.ts
+++ b/src/@ionic-native/plugins/safari-view-controller/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface SafariViewControllerOptions {
@@ -64,14 +64,13 @@ export interface SafariViewControllerOptions {
 })
 @Injectable()
 export class SafariViewController extends IonicNativePlugin {
+
   /**
    * Checks if SafariViewController is available
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isAvailable(): Promise<boolean> {
-    return;
-  }
+  isAvailable(): Promise<boolean> { return; }
 
   /**
    * Shows Safari View Controller
@@ -83,35 +82,27 @@ export class SafariViewController extends IonicNativePlugin {
     errorIndex: 2,
     observable: true
   })
-  show(options?: SafariViewControllerOptions): Observable<any> {
-    return;
-  }
+  show(options?: SafariViewControllerOptions): Observable<any> { return; }
 
   /**
    * Hides Safari View Controller
    */
   @Cordova()
-  hide(): Promise<any> {
-    return;
-  }
+  hide(): Promise<any> { return; }
 
   /**
    * Tries to connect to the  Chrome's custom tabs service. you must call this method before calling any of the other methods listed below.
    * @returns {Promise<any>}
    */
   @Cordova()
-  connectToService(): Promise<any> {
-    return;
-  }
+  connectToService(): Promise<any> { return; }
 
   /**
    * Call this method whenever there's a chance the user will open an external url.
    * @returns {Promise<any>}
    */
   @Cordova()
-  warmUp(): Promise<any> {
-    return;
-  }
+  warmUp(): Promise<any> { return; }
 
   /**
    * For even better performance optimization, call this methods if there's more than a 50% chance the user will open a certain URL.
@@ -119,7 +110,6 @@ export class SafariViewController extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  mayLaunchUrl(url: string): Promise<any> {
-    return;
-  }
+  mayLaunchUrl(url: string): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/screen-orientation/index.ts b/src/@ionic-native/plugins/screen-orientation/index.ts
index 1b3161444..99709bec2 100644
--- a/src/@ionic-native/plugins/screen-orientation/index.ts
+++ b/src/@ionic-native/plugins/screen-orientation/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -40,7 +35,7 @@ import { Observable } from 'rxjs/Observable';
  * );
  *
  * ```
- *
+ * 
  * @advanced
  *
  * Accepted orientation values:
@@ -64,6 +59,7 @@ import { Observable } from 'rxjs/Observable';
 })
 @Injectable()
 export class ScreenOrientation extends IonicNativePlugin {
+
   /**
    * Convenience enum for possible orientations
    */
@@ -85,9 +81,7 @@ export class ScreenOrientation extends IonicNativePlugin {
     eventObservable: true,
     event: 'orientationchange'
   })
-  onChange(): Observable<void> {
-    return;
-  }
+  onChange(): Observable<void> { return; }
 
   /**
    * Lock the orientation to the passed value.
@@ -96,18 +90,18 @@ export class ScreenOrientation extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  lock(orientation: string): Promise<any> {
-    return;
-  }
+  lock(orientation: string): Promise<any> { return; }
 
   /**
    * Unlock and allow all orientations.
    */
   @Cordova({ sync: true })
-  unlock(): void {}
+  unlock(): void { }
 
   /**
    * Get the current orientation of the device.
    */
-  @CordovaProperty type: string;
+  @CordovaProperty
+  type: string;
+
 }
diff --git a/src/@ionic-native/plugins/screenshot/index.ts b/src/@ionic-native/plugins/screenshot/index.ts
index d9911256d..cd0107492 100644
--- a/src/@ionic-native/plugins/screenshot/index.ts
+++ b/src/@ionic-native/plugins/screenshot/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 declare const navigator: any;
 
@@ -30,6 +30,7 @@ declare const navigator: any;
 })
 @Injectable()
 export class Screenshot extends IonicNativePlugin {
+
   /**
    *  Takes screenshot and saves the image
    *
@@ -41,20 +42,22 @@ export class Screenshot extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   save(format?: string, quality?: number, filename?: string): Promise<any> {
-    return new Promise<any>((resolve, reject) => {
-      navigator.screenshot.save(
-        (error: any, result: any) => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve(result);
-          }
-        },
-        format,
-        quality,
-        filename
-      );
-    });
+    return new Promise<any>(
+      (resolve, reject) => {
+        navigator.screenshot.save(
+          (error: any, result: any) => {
+            if (error) {
+              reject(error);
+            } else {
+              resolve(result);
+            }
+          },
+          format,
+          quality,
+          filename
+        );
+      }
+    );
   }
 
   /**
@@ -65,14 +68,19 @@ export class Screenshot extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   URI(quality?: number): Promise<any> {
-    return new Promise<any>((resolve, reject) => {
-      navigator.screenshot.URI((error: any, result: any) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(result);
-        }
-      }, quality);
-    });
+    return new Promise<any>(
+      (resolve, reject) => {
+        navigator.screenshot.URI(
+          (error: any, result: any) => {
+            if (error) {
+              reject(error);
+            } else {
+              resolve(result);
+            }
+          },
+          quality
+        );
+      }
+    );
   }
 }
diff --git a/src/@ionic-native/plugins/secure-storage/index.ts b/src/@ionic-native/plugins/secure-storage/index.ts
index 25b191ae2..7c1d9fb18 100644
--- a/src/@ionic-native/plugins/secure-storage/index.ts
+++ b/src/@ionic-native/plugins/secure-storage/index.ts
@@ -1,16 +1,12 @@
 import { Injectable } from '@angular/core';
-import {
-  CordovaCheck,
-  CordovaInstance,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { CordovaInstance, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @hidden
  */
 export class SecureStorageObject {
-  constructor(private _objectInstance: any) {}
+
+  constructor(private _objectInstance: any) { }
 
   /**
    * Gets a stored item
@@ -20,9 +16,7 @@ export class SecureStorageObject {
   @CordovaInstance({
     callbackOrder: 'reverse'
   })
-  get(key: string): Promise<string> {
-    return;
-  }
+  get(key: string): Promise<string> { return; }
 
   /**
    * Stores a value
@@ -33,9 +27,7 @@ export class SecureStorageObject {
   @CordovaInstance({
     callbackOrder: 'reverse'
   })
-  set(key: string, value: string): Promise<any> {
-    return;
-  }
+  set(key: string, value: string): Promise<any> { return; }
 
   /**
    * Removes a single stored item
@@ -45,9 +37,7 @@ export class SecureStorageObject {
   @CordovaInstance({
     callbackOrder: 'reverse'
   })
-  remove(key: string): Promise<string> {
-    return;
-  }
+  remove(key: string): Promise<string> { return; }
 
   /**
    * Get all references from the storage.
@@ -56,9 +46,7 @@ export class SecureStorageObject {
   @CordovaInstance({
     callbackOrder: 'reverse'
   })
-  keys(): Promise<string[]> {
-    return;
-  }
+  keys(): Promise<string[]> { return; }
 
   /**
    * Clear all references from the storage.
@@ -67,18 +55,15 @@ export class SecureStorageObject {
   @CordovaInstance({
     callbackOrder: 'reverse'
   })
-  clear(): Promise<any> {
-    return;
-  }
+  clear(): Promise<any> { return; }
 
   /**
    * Brings up the screen-lock settings
    * @returns {Promise<any>}
    */
   @CordovaInstance()
-  secureDevice(): Promise<any> {
-    return;
-  }
+  secureDevice(): Promise<any> { return; }
+
 }
 
 /**
@@ -136,6 +121,7 @@ export class SecureStorageObject {
 })
 @Injectable()
 export class SecureStorage extends IonicNativePlugin {
+
   /**
    * Creates a namespaced storage.
    * @param store {string}
@@ -144,11 +130,8 @@ export class SecureStorage extends IonicNativePlugin {
   @CordovaCheck()
   create(store: string): Promise<SecureStorageObject> {
     return new Promise((res: Function, rej: Function) => {
-      const instance = new (SecureStorage.getPlugin())(
-        () => res(new SecureStorageObject(instance)),
-        rej,
-        store
-      );
+      const instance = new (SecureStorage.getPlugin())(() => res(new SecureStorageObject(instance)), rej, store);
     });
   }
+
 }
diff --git a/src/@ionic-native/plugins/serial/index.ts b/src/@ionic-native/plugins/serial/index.ts
index bf5ce79b1..3c63fd9d0 100644
--- a/src/@ionic-native/plugins/serial/index.ts
+++ b/src/@ionic-native/plugins/serial/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare var serial: any;
@@ -58,6 +58,7 @@ export interface SerialOpenOptions {
 })
 @Injectable()
 export class Serial extends IonicNativePlugin {
+
   /**
    * Request permission to connect to a serial device
    *
@@ -68,9 +69,7 @@ export class Serial extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  requestPermission(options?: SerialPermissionOptions): Promise<any> {
-    return;
-  }
+  requestPermission(options?: SerialPermissionOptions): Promise<any> { return; }
 
   /**
    * Open connection to a serial device
@@ -79,9 +78,7 @@ export class Serial extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when the serial connection is opened
    */
   @Cordova()
-  open(options: SerialOpenOptions): Promise<any> {
-    return;
-  }
+  open(options: SerialOpenOptions): Promise<any> { return; }
 
   /**
    * Write to a serial connection
@@ -90,9 +87,7 @@ export class Serial extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when the write is complete
    */
   @Cordova()
-  write(data: any): Promise<any> {
-    return;
-  }
+  write(data: any): Promise<any> { return; }
 
   /**
    * Write hex to a serial connection
@@ -101,9 +96,7 @@ export class Serial extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when the write is complete
    */
   @Cordova()
-  writeHex(data: any): Promise<any> {
-    return;
-  }
+  writeHex(data: any): Promise<any> { return; }
 
   /**
    * Read from a serial connection
@@ -111,9 +104,7 @@ export class Serial extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves with data read from the serial connection
    */
   @Cordova()
-  read(): Promise<any> {
-    return;
-  }
+  read(): Promise<any> { return; }
 
   /**
    * Watch the incoming data from the serial connection. Clear the watch by unsubscribing from the observable
@@ -123,9 +114,7 @@ export class Serial extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  registerReadCallback(): Observable<any> {
-    return;
-  }
+  registerReadCallback(): Observable<any> { return; }
 
   /**
    * Close the serial connection
@@ -133,7 +122,6 @@ export class Serial extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when the serial connection is closed
    */
   @Cordova()
-  close(): Promise<any> {
-    return;
-  }
+  close(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/shake/index.ts b/src/@ionic-native/plugins/shake/index.ts
index 00a242aad..9c731ecd0 100644
--- a/src/@ionic-native/plugins/shake/index.ts
+++ b/src/@ionic-native/plugins/shake/index.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
-
 /**
  * @name Shake
  * @description Handles shake gesture
@@ -40,7 +39,6 @@ export class Shake extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 2
   })
-  startWatch(sensitivity?: number): Observable<any> {
-    return;
-  }
+  startWatch(sensitivity?: number): Observable<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/sim/index.ts b/src/@ionic-native/plugins/sim/index.ts
index 63b482004..4e7f97f15 100644
--- a/src/@ionic-native/plugins/sim/index.ts
+++ b/src/@ionic-native/plugins/sim/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name Sim
@@ -46,9 +47,7 @@ export class Sim extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  getSimInfo(): Promise<any> {
-    return;
-  }
+  getSimInfo(): Promise<any> { return; }
 
   /**
    * Check permission
@@ -57,9 +56,7 @@ export class Sim extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  hasReadPermission(): Promise<any> {
-    return;
-  }
+  hasReadPermission(): Promise<any> { return; }
 
   /**
    * Request permission
@@ -68,7 +65,5 @@ export class Sim extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  requestReadPermission(): Promise<any> {
-    return;
-  }
+  requestReadPermission(): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/sms/index.ts b/src/@ionic-native/plugins/sms/index.ts
index 0e7ef9a36..eb147542b 100644
--- a/src/@ionic-native/plugins/sms/index.ts
+++ b/src/@ionic-native/plugins/sms/index.ts
@@ -1,23 +1,28 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * Options for sending an SMS
  */
 export interface SmsOptions {
+
   /**
    * Set to true to replace \n by a new line. Default: false
    */
   replaceLineBreaks?: boolean;
 
   android?: SmsOptionsAndroid;
+
 }
 
 export interface SmsOptionsAndroid {
+
   /**
    * Set to "INTENT" to send SMS with the native android SMS messaging. Leaving it empty will send the SMS without opening any app.
    */
   intent?: string;
+
 }
 
 /**
@@ -52,6 +57,7 @@ export interface SmsOptionsAndroid {
 })
 @Injectable()
 export class SMS extends IonicNativePlugin {
+
   /**
    * Sends sms to a number
    * @param phoneNumber {string|Array<string>} Phone number
@@ -67,9 +73,7 @@ export class SMS extends IonicNativePlugin {
     phoneNumber: string | string[],
     message: string,
     options?: SmsOptions
-  ): Promise<any> {
-    return;
-  }
+    ): Promise<any> { return; }
 
   /**
    * This function lets you know if the app has permission to send SMS
@@ -78,7 +82,6 @@ export class SMS extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  hasPermission(): Promise<boolean> {
-    return;
-  }
+  hasPermission(): Promise<boolean> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/social-sharing/index.ts b/src/@ionic-native/plugins/social-sharing/index.ts
index 2cfca88ec..f9665a9a9 100644
--- a/src/@ionic-native/plugins/social-sharing/index.ts
+++ b/src/@ionic-native/plugins/social-sharing/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name Social Sharing
@@ -52,14 +53,7 @@ export class SocialSharing extends IonicNativePlugin {
     successIndex: 4,
     errorIndex: 5
   })
-  share(
-    message?: string,
-    subject?: string,
-    file?: string | string[],
-    url?: string
-  ): Promise<any> {
-    return;
-  }
+  share(message?: string, subject?: string, file?: string | string[], url?: string): Promise<any> { return; }
 
   /**
    * Shares using the share sheet with additional options and returns a result object or an error message (requires plugin version 5.1.0+)
@@ -69,15 +63,7 @@ export class SocialSharing extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS', 'Android']
   })
-  shareWithOptions(options: {
-    message?: string;
-    subject?: string;
-    files?: string | string[];
-    url?: string;
-    chooserTitle?: string;
-  }): Promise<any> {
-    return;
-  }
+  shareWithOptions(options: { message?: string, subject?: string, files?: string | string[], url?: string, chooserTitle?: string }): Promise<any> { return; }
 
   /**
    * Checks if you can share via a specific app.
@@ -93,15 +79,7 @@ export class SocialSharing extends IonicNativePlugin {
     errorIndex: 6,
     platforms: ['iOS', 'Android']
   })
-  canShareVia(
-    appName: string,
-    message?: string,
-    subject?: string,
-    image?: string,
-    url?: string
-  ): Promise<any> {
-    return;
-  }
+  canShareVia(appName: string, message?: string, subject?: string, image?: string, url?: string): Promise<any> { return; }
 
   /**
    * Shares directly to Twitter
@@ -115,9 +93,7 @@ export class SocialSharing extends IonicNativePlugin {
     errorIndex: 4,
     platforms: ['iOS', 'Android']
   })
-  shareViaTwitter(message: string, image?: string, url?: string): Promise<any> {
-    return;
-  }
+  shareViaTwitter(message: string, image?: string, url?: string): Promise<any> { return; }
 
   /**
    * Shares directly to Facebook
@@ -131,13 +107,8 @@ export class SocialSharing extends IonicNativePlugin {
     errorIndex: 4,
     platforms: ['iOS', 'Android']
   })
-  shareViaFacebook(
-    message: string,
-    image?: string,
-    url?: string
-  ): Promise<any> {
-    return;
-  }
+  shareViaFacebook(message: string, image?: string, url?: string): Promise<any> { return; }
+
 
   /**
    * Shares directly to Facebook with a paste message hint
@@ -152,14 +123,7 @@ export class SocialSharing extends IonicNativePlugin {
     errorIndex: 5,
     platforms: ['iOS', 'Android']
   })
-  shareViaFacebookWithPasteMessageHint(
-    message: string,
-    image?: string,
-    url?: string,
-    pasteMessageHint?: string
-  ): Promise<any> {
-    return;
-  }
+  shareViaFacebookWithPasteMessageHint(message: string, image?: string, url?: string, pasteMessageHint?: string): Promise<any> { return; }
 
   /**
    * Shares directly to Instagram
@@ -170,9 +134,7 @@ export class SocialSharing extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS', 'Android']
   })
-  shareViaInstagram(message: string, image: string): Promise<any> {
-    return;
-  }
+  shareViaInstagram(message: string, image: string): Promise<any> { return; }
 
   /**
    * Shares directly to WhatsApp
@@ -186,13 +148,7 @@ export class SocialSharing extends IonicNativePlugin {
     errorIndex: 4,
     platforms: ['iOS', 'Android']
   })
-  shareViaWhatsApp(
-    message: string,
-    image?: string,
-    url?: string
-  ): Promise<any> {
-    return;
-  }
+  shareViaWhatsApp(message: string, image?: string, url?: string): Promise<any> { return; }
 
   /**
    * Shares directly to a WhatsApp Contact
@@ -207,14 +163,7 @@ export class SocialSharing extends IonicNativePlugin {
     errorIndex: 5,
     platforms: ['iOS', 'Android']
   })
-  shareViaWhatsAppToReceiver(
-    receiver: string,
-    message: string,
-    image?: string,
-    url?: string
-  ): Promise<any> {
-    return;
-  }
+  shareViaWhatsAppToReceiver(receiver: string, message: string, image?: string, url?: string): Promise<any> { return; }
 
   /**
    * Share via SMS
@@ -225,9 +174,7 @@ export class SocialSharing extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS', 'Android']
   })
-  shareViaSMS(messge: string, phoneNumber: string): Promise<any> {
-    return;
-  }
+  shareViaSMS(messge: string, phoneNumber: string): Promise<any> { return; }
 
   /**
    * Checks if you can share via email
@@ -236,9 +183,7 @@ export class SocialSharing extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS', 'Android']
   })
-  canShareViaEmail(): Promise<any> {
-    return;
-  }
+  canShareViaEmail(): Promise<any> { return; }
 
   /**
    * Share via Email
@@ -255,16 +200,7 @@ export class SocialSharing extends IonicNativePlugin {
     successIndex: 6,
     errorIndex: 7
   })
-  shareViaEmail(
-    message: string,
-    subject: string,
-    to: string[],
-    cc?: string[],
-    bcc?: string[],
-    files?: string | string[]
-  ): Promise<any> {
-    return;
-  }
+  shareViaEmail(message: string, subject: string, to: string[], cc?: string[], bcc?: string[], files?: string | string[]): Promise<any> { return; }
 
   /**
    * Share via AppName
@@ -280,15 +216,7 @@ export class SocialSharing extends IonicNativePlugin {
     errorIndex: 6,
     platforms: ['iOS', 'Android']
   })
-  shareVia(
-    appName: string,
-    message: string,
-    subject?: string,
-    image?: string,
-    url?: string
-  ): Promise<any> {
-    return;
-  }
+  shareVia(appName: string, message: string, subject?: string, image?: string, url?: string): Promise<any> { return; }
 
   /**
    * defines the popup position before call the share method.
@@ -298,5 +226,5 @@ export class SocialSharing extends IonicNativePlugin {
     sync: true,
     platforms: ['iOS']
   })
-  setIPadPopupCoordinates(targetBounds: string): void {}
+  setIPadPopupCoordinates(targetBounds: string): void { }
 }
diff --git a/src/@ionic-native/plugins/speech-recognition/index.ts b/src/@ionic-native/plugins/speech-recognition/index.ts
index f426748fd..e3e265796 100644
--- a/src/@ionic-native/plugins/speech-recognition/index.ts
+++ b/src/@ionic-native/plugins/speech-recognition/index.ts
@@ -1,10 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
-export type SpeechRecognitionListeningOptions =
-  | SpeechRecognitionListeningOptionsIOS
-  | SpeechRecognitionListeningOptionsAndroid;
+export type SpeechRecognitionListeningOptions = SpeechRecognitionListeningOptionsIOS | SpeechRecognitionListeningOptionsAndroid;
 
 export interface SpeechRecognitionListeningOptionsIOS {
   /**
@@ -103,6 +101,7 @@ export interface SpeechRecognitionListeningOptionsAndroid {
 })
 @Injectable()
 export class SpeechRecognition extends IonicNativePlugin {
+
   /**
    * Check feature available
    * @return {Promise<boolean>}
@@ -118,11 +117,10 @@ export class SpeechRecognition extends IonicNativePlugin {
    */
   @Cordova({
     callbackOrder: 'reverse',
-    observable: true
+    observable: true,
+
   })
-  startListening(
-    options?: SpeechRecognitionListeningOptions
-  ): Observable<Array<string>> {
+  startListening(options?: SpeechRecognitionListeningOptions): Observable<Array<string>> {
     return;
   }
 
@@ -162,4 +160,5 @@ export class SpeechRecognition extends IonicNativePlugin {
   requestPermission(): Promise<void> {
     return;
   }
+
 }
diff --git a/src/@ionic-native/plugins/spinner-dialog/index.ts b/src/@ionic-native/plugins/spinner-dialog/index.ts
index 69c1910c1..7b032b0f8 100644
--- a/src/@ionic-native/plugins/spinner-dialog/index.ts
+++ b/src/@ionic-native/plugins/spinner-dialog/index.ts
@@ -50,6 +50,7 @@ export interface SpinnerDialogIOSOptions {
 })
 @Injectable()
 export class SpinnerDialog extends IonicNativePlugin {
+
   /**
    * Shows the spinner dialog
    * @param title {string} Spinner title (shows on Android only)
@@ -60,12 +61,7 @@ export class SpinnerDialog extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  show(
-    title?: string,
-    message?: string,
-    cancelCallback?: any,
-    iOSOptions?: SpinnerDialogIOSOptions
-  ): void {}
+  show(title?: string, message?: string, cancelCallback?: any, iOSOptions?: SpinnerDialogIOSOptions): void { }
 
   /**
    * Hides the spinner dialog if visible
@@ -73,5 +69,6 @@ export class SpinnerDialog extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  hide(): void {}
+  hide(): void { }
+
 }
diff --git a/src/@ionic-native/plugins/splash-screen/index.ts b/src/@ionic-native/plugins/splash-screen/index.ts
index 2a79e0ccf..eb71f91e3 100644
--- a/src/@ionic-native/plugins/splash-screen/index.ts
+++ b/src/@ionic-native/plugins/splash-screen/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name Splash Screen
@@ -26,13 +27,14 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class SplashScreen extends IonicNativePlugin {
+
   /**
    * Shows the splashscreen
    */
   @Cordova({
     sync: true
   })
-  show(): void {}
+  show(): void { }
 
   /**
    * Hides the splashscreen
@@ -40,5 +42,6 @@ export class SplashScreen extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  hide(): void {}
+  hide(): void { }
+
 }
diff --git a/src/@ionic-native/plugins/sqlite-porter/index.ts b/src/@ionic-native/plugins/sqlite-porter/index.ts
index 8b2a023c2..b4e4b3ef0 100644
--- a/src/@ionic-native/plugins/sqlite-porter/index.ts
+++ b/src/@ionic-native/plugins/sqlite-porter/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name SQLite Porter
@@ -43,19 +43,11 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   plugin: 'uk.co.workingedge.cordova.plugin.sqliteporter',
   pluginRef: 'cordova.plugins.sqlitePorter',
   repo: 'https://github.com/dpa99c/cordova-sqlite-porter',
-  platforms: [
-    'Amazon Fire OS',
-    'Android',
-    'BlackBerry 10',
-    'Browser',
-    'iOS',
-    'Tizen',
-    'Windows',
-    'Windows Phone'
-  ]
+  platforms: ['Amazon Fire OS', 'Android', 'BlackBerry 10', 'Browser', 'iOS', 'Tizen', 'Windows', 'Windows Phone']
 })
 @Injectable()
 export class SQLitePorter extends IonicNativePlugin {
+
   /**
    * Executes a set of SQL statements against the defined database. Can be used to import data defined in the SQL statements into the database, and may additionally include commands to create the table structure.
    * @param db {Object} Database object
@@ -67,9 +59,7 @@ export class SQLitePorter extends IonicNativePlugin {
     successName: 'successFn',
     errorName: 'errorFn'
   })
-  importSqlToDb(db: any, sql: string): Promise<any> {
-    return;
-  }
+  importSqlToDb(db: any, sql: string): Promise<any> { return; }
 
   /**
    * Exports a SQLite DB as a set of SQL statements.
@@ -81,9 +71,7 @@ export class SQLitePorter extends IonicNativePlugin {
     successName: 'successFn',
     errorName: 'errorFn'
   })
-  exportDbToSql(db: any): Promise<any> {
-    return;
-  }
+  exportDbToSql(db: any): Promise<any> { return; }
 
   /**
    * Converts table structure and/or row data contained within a JSON structure into SQL statements that can be executed against a SQLite database. Can be used to import data into the database and/or create the table structure.
@@ -96,9 +84,7 @@ export class SQLitePorter extends IonicNativePlugin {
     successName: 'successFn',
     errorName: 'errorFn'
   })
-  importJsonToDb(db: any, json: any): Promise<any> {
-    return;
-  }
+  importJsonToDb(db: any, json: any): Promise<any> { return; }
 
   /**
    * Exports a SQLite DB as a JSON structure
@@ -110,9 +96,7 @@ export class SQLitePorter extends IonicNativePlugin {
     successName: 'successFn',
     errorName: 'errorFn'
   })
-  exportDbToJson(db: any): Promise<any> {
-    return;
-  }
+  exportDbToJson(db: any): Promise<any> { return; }
 
   /**
    * Wipes all data from a database by dropping all existing tables
@@ -124,7 +108,6 @@ export class SQLitePorter extends IonicNativePlugin {
     successName: 'successFn',
     errorName: 'errorFn'
   })
-  wipeDb(db: any): Promise<any> {
-    return;
-  }
+  wipeDb(db: any): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/status-bar/index.ts b/src/@ionic-native/plugins/status-bar/index.ts
index f9ee010a9..9d56deb40 100644
--- a/src/@ionic-native/plugins/status-bar/index.ts
+++ b/src/@ionic-native/plugins/status-bar/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Status Bar
@@ -47,7 +42,7 @@ export class StatusBar extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  overlaysWebView(doesOverlay: boolean) {}
+  overlaysWebView(doesOverlay: boolean) { };
 
   /**
    * Use the default statusbar (dark text, for light backgrounds).
@@ -55,7 +50,7 @@ export class StatusBar extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  styleDefault() {}
+  styleDefault() { };
 
   /**
    * Use the lightContent statusbar (light text, for dark backgrounds).
@@ -63,7 +58,7 @@ export class StatusBar extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  styleLightContent() {}
+  styleLightContent() { };
 
   /**
    * Use the blackTranslucent statusbar (light text, for dark backgrounds).
@@ -71,7 +66,7 @@ export class StatusBar extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  styleBlackTranslucent() {}
+  styleBlackTranslucent() { };
 
   /**
    * Use the blackOpaque statusbar (light text, for dark backgrounds).
@@ -79,7 +74,7 @@ export class StatusBar extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  styleBlackOpaque() {}
+  styleBlackOpaque() { };
 
   /**
    * Set the status bar to a specific named color. Valid options:
@@ -92,7 +87,7 @@ export class StatusBar extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  backgroundColorByName(colorName: string) {}
+  backgroundColorByName(colorName: string) { };
 
   /**
    * Set the status bar to a specific hex color (CSS shorthand supported!).
@@ -104,7 +99,7 @@ export class StatusBar extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  backgroundColorByHexString(hexString: string) {}
+  backgroundColorByHexString(hexString: string) { };
 
   /**
    * Hide the StatusBar
@@ -112,18 +107,20 @@ export class StatusBar extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  hide() {}
+  hide() { };
 
   /**
-   * Show the StatusBar
-   */
+  * Show the StatusBar
+  */
   @Cordova({
     sync: true
   })
-  show() {}
+  show() { };
 
   /**
    * Whether the StatusBar is currently visible or not.
    */
-  @CordovaProperty isVisible: boolean;
+  @CordovaProperty
+  isVisible: boolean;
+
 }
diff --git a/src/@ionic-native/plugins/stepcounter/index.ts b/src/@ionic-native/plugins/stepcounter/index.ts
index 58bf63e5c..a24ce3889 100644
--- a/src/@ionic-native/plugins/stepcounter/index.ts
+++ b/src/@ionic-native/plugins/stepcounter/index.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 /**
  * @name Stepcounter
  * @description
@@ -34,6 +33,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Stepcounter extends IonicNativePlugin {
+
   /**
    * Start the step counter
    *
@@ -41,52 +41,40 @@ export class Stepcounter extends IonicNativePlugin {
    * @returns {Promise<any | number>} Returns a Promise that resolves on success or rejects on failure
    */
   @Cordova()
-  start(startingOffset: number): Promise<number | any> {
-    return;
-  }
+  start(startingOffset: number): Promise<number | any> { return; }
 
   /**
    * Stop the step counter
    * @returns {Promise<any | number>} Returns a Promise that resolves on success with the amount of steps since the start command has been called, or rejects on failure
    */
   @Cordova()
-  stop(): Promise<number | any> {
-    return;
-  }
+  stop(): Promise<number | any> { return; }
 
   /**
    * Get the amount of steps for today (or -1 if it no data given)
    * @returns {Promise<any | number>} Returns a Promise that resolves on success with the amount of steps today, or rejects on failure
    */
   @Cordova()
-  getTodayStepCount(): Promise<number | any> {
-    return;
-  }
+  getTodayStepCount(): Promise<number | any> { return; }
 
   /**
    * Get the amount of steps since the start command has been called
    * @returns {Promise<any | number>} Returns a Promise that resolves on success with the amount of steps since the start command has been called, or rejects on failure
    */
   @Cordova()
-  getStepCount(): Promise<number | any> {
-    return;
-  }
+  getStepCount(): Promise<number | any> { return; }
 
   /**
    * Returns true/false if Android device is running >API level 19 && has the step counter API available
    * @returns {Promise<any | boolean>} Returns a Promise that resolves on success, or rejects on failure
    */
   @Cordova()
-  deviceCanCountSteps(): Promise<boolean | any> {
-    return;
-  }
+  deviceCanCountSteps(): Promise<boolean | any> { return; }
 
   /**
    * Get the step history (JavaScript object)
    * @returns {Promise<any>} Returns a Promise that resolves on success, or rejects on failure
    */
   @Cordova()
-  getHistory(): Promise<any> {
-    return;
-  }
+  getHistory(): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/streaming-media/index.ts b/src/@ionic-native/plugins/streaming-media/index.ts
index caa9623fc..6fb18f53c 100644
--- a/src/@ionic-native/plugins/streaming-media/index.ts
+++ b/src/@ionic-native/plugins/streaming-media/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface StreamingVideoOptions {
   successCallback?: Function;
@@ -55,7 +55,7 @@ export class StreamingMedia extends IonicNativePlugin {
    * @param options {StreamingVideoOptions} Options
    */
   @Cordova({ sync: true })
-  playVideo(videoUrl: string, options?: StreamingVideoOptions): void {}
+  playVideo(videoUrl: string, options?: StreamingVideoOptions): void { }
 
   /**
    * Streams an audio
@@ -63,23 +63,24 @@ export class StreamingMedia extends IonicNativePlugin {
    * @param options {StreamingAudioOptions} Options
    */
   @Cordova({ sync: true })
-  playAudio(audioUrl: string, options?: StreamingAudioOptions): void {}
+  playAudio(audioUrl: string, options?: StreamingAudioOptions): void { }
 
   /**
    * Stops streaming audio
    */
   @Cordova({ sync: true })
-  stopAudio(): void {}
+  stopAudio(): void { }
 
   /**
    * Pauses streaming audio
    */
   @Cordova({ sync: true, platforms: ['iOS'] })
-  pauseAudio(): void {}
+  pauseAudio(): void { }
 
   /**
    * Resumes streaming audio
    */
   @Cordova({ sync: true, platforms: ['iOS'] })
-  resumeAudio(): void {}
+  resumeAudio(): void { }
+
 }
diff --git a/src/@ionic-native/plugins/stripe/index.ts b/src/@ionic-native/plugins/stripe/index.ts
index 0296affa4..32eda51de 100644
--- a/src/@ionic-native/plugins/stripe/index.ts
+++ b/src/@ionic-native/plugins/stripe/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface StripeCardTokenParams {
   /**
@@ -80,28 +80,28 @@ export interface StripeBankAccountParams {
 }
 
 export interface StripeCardTokenRes {
-  /**
-   * Card Object.
-   */
-  card: {
-    brand: string;
-    exp_month: number;
-    exp_year: number;
-    funding: string;
-    last4: string;
-  };
-  /**
-   * Token Request Date Time.
-   */
-  created: string;
-  /**
-   * Card Token.
-   */
-  id: string;
-  /**
-   * Source Type (card or account).
-   */
-  type: string;
+    /**
+     * Card Object.
+     */
+    card: {
+        brand: string,
+        exp_month: number,
+        exp_year: number,
+        funding: string,
+        last4: string
+    };
+    /**
+     * Token Request Date Time.
+     */
+    created: string;
+    /**
+     * Card Token.
+     */
+    id: string;
+    /**
+     * Source Type (card or account).
+     */
+    type: string;
 }
 
 /**
@@ -144,15 +144,14 @@ export interface StripeCardTokenRes {
 })
 @Injectable()
 export class Stripe extends IonicNativePlugin {
+
   /**
    * Set publishable key
    * @param publishableKey {string} Publishable key
    * @return {Promise<void>}
    */
   @Cordova()
-  setPublishableKey(publishableKey: string): Promise<void> {
-    return;
-  }
+  setPublishableKey(publishableKey: string): Promise<void> { return; }
 
   /**
    * Create Credit Card Token
@@ -160,9 +159,7 @@ export class Stripe extends IonicNativePlugin {
    * @return {Promise<StripeCardTokenRes>} returns a promise that resolves with the token object, or rejects with an error
    */
   @Cordova()
-  createCardToken(params: StripeCardTokenParams): Promise<StripeCardTokenRes> {
-    return;
-  }
+  createCardToken(params: StripeCardTokenParams): Promise<StripeCardTokenRes> { return; }
 
   /**
    * Create a bank account token
@@ -170,9 +167,7 @@ export class Stripe extends IonicNativePlugin {
    * @return {Promise<string>} returns a promise that resolves with the token, or rejects with an error
    */
   @Cordova()
-  createBankAccountToken(params: StripeBankAccountParams): Promise<string> {
-    return;
-  }
+  createBankAccountToken(params: StripeBankAccountParams): Promise<string> { return; }
 
   /**
    * Validates a credit card number
@@ -180,9 +175,7 @@ export class Stripe extends IonicNativePlugin {
    * @return {Promise<any>} returns a promise that resolves if the number is valid, and rejects if it's invalid
    */
   @Cordova()
-  validateCardNumber(cardNumber: string): Promise<any> {
-    return;
-  }
+  validateCardNumber(cardNumber: string): Promise<any> { return; }
 
   /**
    * Validates a CVC number
@@ -190,9 +183,7 @@ export class Stripe extends IonicNativePlugin {
    * @return {Promise<any>} returns a promise that resolves if the number is valid, and rejects if it's invalid
    */
   @Cordova()
-  validateCVC(cvc: string): Promise<any> {
-    return;
-  }
+  validateCVC(cvc: string): Promise<any> { return; }
 
   /**
    * Validates an expiry date
@@ -201,9 +192,7 @@ export class Stripe extends IonicNativePlugin {
    * @return {Promise<any>} returns a promise that resolves if the date is valid, and rejects if it's invalid
    */
   @Cordova()
-  validateExpiryDate(expMonth: string, expYear: string): Promise<any> {
-    return;
-  }
+  validateExpiryDate(expMonth: string, expYear: string): Promise<any> { return; }
 
   /**
    * Get a card type from card number
@@ -211,7 +200,6 @@ export class Stripe extends IonicNativePlugin {
    * @return {Promise<string>} returns a promise that resolves with the credit card type
    */
   @Cordova()
-  getCardType(cardNumber: string): Promise<string> {
-    return;
-  }
+  getCardType(cardNumber: string): Promise<string> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/taptic-engine/index.ts b/src/@ionic-native/plugins/taptic-engine/index.ts
index 5688bd979..f74763711 100644
--- a/src/@ionic-native/plugins/taptic-engine/index.ts
+++ b/src/@ionic-native/plugins/taptic-engine/index.ts
@@ -33,14 +33,13 @@ import { Injectable } from '@angular/core';
 })
 @Injectable()
 export class TapticEngine extends IonicNativePlugin {
+
   /**
    * Use selection feedback generators to indicate a change in selection.
    * @returns {Promise<any>} Returns a promise that resolves on success and rejects on error
    */
   @Cordova()
-  selection(): Promise<any> {
-    return;
-  }
+  selection(): Promise<any> { return; }
 
   /**
    * Use this to indicate success/failure/warning to the user.
@@ -49,9 +48,7 @@ export class TapticEngine extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a promise that resolves on success and rejects on error
    */
   @Cordova()
-  notification(options: { type: string }): Promise<any> {
-    return;
-  }
+  notification(options: { type: string }): Promise<any> { return; }
 
   /**
    * Use this to indicate success/failure/warning to the user.
@@ -60,7 +57,6 @@ export class TapticEngine extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a promise that resolves on success and rejects on error
    */
   @Cordova()
-  impact(options: { style: string }): Promise<any> {
-    return;
-  }
+  impact(options: { style: string }): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/text-to-speech/index.ts b/src/@ionic-native/plugins/text-to-speech/index.ts
index fb348561f..9a34e4d29 100644
--- a/src/@ionic-native/plugins/text-to-speech/index.ts
+++ b/src/@ionic-native/plugins/text-to-speech/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface TTSOptions {
   /** text to speak */
@@ -40,6 +40,7 @@ export interface TTSOptions {
 })
 @Injectable()
 export class TextToSpeech extends IonicNativePlugin {
+
   /**
    * This function speaks
    * @param textOrOptions {string | TTSOptions} Text to speak or TTSOptions
@@ -61,4 +62,5 @@ export class TextToSpeech extends IonicNativePlugin {
   stop(): Promise<any> {
     return;
   }
+
 }
diff --git a/src/@ionic-native/plugins/themeable-browser/index.ts b/src/@ionic-native/plugins/themeable-browser/index.ts
index fb7fee72b..76e4a73b7 100644
--- a/src/@ionic-native/plugins/themeable-browser/index.ts
+++ b/src/@ionic-native/plugins/themeable-browser/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  CordovaInstance,
-  InstanceCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Plugin, CordovaInstance, InstanceCheck, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare var cordova: any;
@@ -76,24 +71,15 @@ export interface ThemeableBrowserOptions {
  * @hidden
  */
 export class ThemeableBrowserObject {
+
   private _objectInstance: any;
 
-  constructor(
-    url: string,
-    target: string,
-    styleOptions: ThemeableBrowserOptions
-  ) {
+  constructor(url: string, target: string, styleOptions: ThemeableBrowserOptions) {
     try {
-      this._objectInstance = cordova.ThemeableBrowser.open(
-        url,
-        target,
-        styleOptions
-      );
+      this._objectInstance = cordova.ThemeableBrowser.open(url, target, styleOptions);
     } catch (e) {
       window.open(url);
-      console.warn(
-        'Native: ThemeableBrowser is not installed or you are running on a browser. Falling back to window.open.'
-      );
+      console.warn('Native: ThemeableBrowser is not installed or you are running on a browser. Falling back to window.open.');
     }
   }
 
@@ -102,19 +88,19 @@ export class ThemeableBrowserObject {
    * if the browser was already visible.
    */
   @CordovaInstance({ sync: true })
-  show(): void {}
+  show(): void { }
 
   /**
    * Closes the browser window.
    */
   @CordovaInstance({ sync: true })
-  close(): void {}
+  close(): void { }
 
   /**
    * Reloads the current page
    */
   @CordovaInstance({ sync: true })
-  reload(): void {}
+  reload(): void { }
 
   /**
    * Injects JavaScript code into the browser window.
@@ -122,9 +108,7 @@ export class ThemeableBrowserObject {
    * @returns {Promise<any>}
    */
   @CordovaInstance()
-  executeScript(script: { file?: string; code?: string }): Promise<any> {
-    return;
-  }
+  executeScript(script: { file?: string, code?: string }): Promise<any> { return; }
 
   /**
    * Injects CSS into the browser window.
@@ -132,9 +116,7 @@ export class ThemeableBrowserObject {
    * @returns {Promise<any>}
    */
   @CordovaInstance()
-  insertCss(css: { file?: string; code?: string }): Promise<any> {
-    return;
-  }
+  insertCss(css: { file?: string, code?: string }): Promise<any> { return; }
 
   /**
    * A method that allows you to listen to events happening in the browser.
@@ -144,18 +126,12 @@ export class ThemeableBrowserObject {
    */
   @InstanceCheck({ observable: true })
   on(event: string): Observable<any> {
-    return new Observable<any>(observer => {
-      this._objectInstance.addEventListener(
-        event,
-        observer.next.bind(observer)
-      );
-      return () =>
-        this._objectInstance.removeEventListener(
-          event,
-          observer.next.bind(observer)
-        );
+    return new Observable<any>((observer) => {
+      this._objectInstance.addEventListener(event, observer.next.bind(observer));
+      return () => this._objectInstance.removeEventListener(event, observer.next.bind(observer));
     });
   }
+
 }
 
 /**
@@ -248,20 +224,11 @@ export class ThemeableBrowserObject {
   plugin: 'cordova-plugin-themeablebrowser',
   pluginRef: 'cordova.ThemeableBrowser',
   repo: 'https://github.com/initialxy/cordova-plugin-themeablebrowser',
-  platforms: [
-    'Amazon Fire OS',
-    'Android',
-    'Blackberry 10',
-    'Browser',
-    'FirefoxOS',
-    'iOS',
-    'Ubuntu',
-    'Windows',
-    'Windows Phone'
-  ]
+  platforms: ['Amazon Fire OS', 'Android', 'Blackberry 10', 'Browser', 'FirefoxOS', 'iOS', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
 export class ThemeableBrowser extends IonicNativePlugin {
+
   /**
    * Creates a browser instance
    * @param url {string} URL to open
@@ -269,11 +236,8 @@ export class ThemeableBrowser extends IonicNativePlugin {
    * @param styleOptions {ThemeableBrowserOptions} Themeable browser options
    * @returns {ThemeableBrowserObject}
    */
-  create(
-    url: string,
-    target: string,
-    styleOptions: ThemeableBrowserOptions
-  ): ThemeableBrowserObject {
+  create(url: string, target: string, styleOptions: ThemeableBrowserOptions): ThemeableBrowserObject {
     return new ThemeableBrowserObject(url, target, styleOptions);
   }
+
 }
diff --git a/src/@ionic-native/plugins/three-dee-touch/index.ts b/src/@ionic-native/plugins/three-dee-touch/index.ts
index 8803c0d7b..6907118a0 100644
--- a/src/@ionic-native/plugins/three-dee-touch/index.ts
+++ b/src/@ionic-native/plugins/three-dee-touch/index.ts
@@ -1,13 +1,9 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaFunctionOverride,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, CordovaFunctionOverride, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface ThreeDeeTouchQuickAction {
+
   /**
    * Type that can be used in the onHomeIconPressed callback
    */
@@ -32,9 +28,11 @@ export interface ThreeDeeTouchQuickAction {
    * Icon template
    */
   iconTemplate?: string;
+
 }
 
 export interface ThreeDeeTouchForceTouch {
+
   /**
    * Touch force
    */
@@ -54,6 +52,7 @@ export interface ThreeDeeTouchForceTouch {
    * Y coordinate of action
    */
   y: number;
+
 }
 
 /**
@@ -129,14 +128,13 @@ export interface ThreeDeeTouchForceTouch {
 })
 @Injectable()
 export class ThreeDeeTouch extends IonicNativePlugin {
+
   /**
    * You need an iPhone 6S or some future tech to use the features of this plugin, so you can check at runtime if the user's device is supported.
    * @returns {Promise<boolean>} returns a promise that resolves with a boolean that indicates whether the plugin is available or not
    */
   @Cordova()
-  isAvailable(): Promise<boolean> {
-    return;
-  }
+  isAvailable(): Promise<boolean> { return; }
 
   /**
    * You can get a notification when the user force touches the webview. The plugin defines a Force Touch when at least 75% of the maximum force is applied to the screen. Your app will receive the x and y coordinates, so you have to figure out which UI element was touched.
@@ -145,9 +143,7 @@ export class ThreeDeeTouch extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  watchForceTouches(): Observable<ThreeDeeTouchForceTouch> {
-    return;
-  }
+  watchForceTouches(): Observable<ThreeDeeTouchForceTouch> { return; }
 
   /**
    * setup the 3D-touch actions, takes an array of objects with the following
@@ -160,16 +156,14 @@ export class ThreeDeeTouch extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  configureQuickActions(quickActions: Array<ThreeDeeTouchQuickAction>): void {}
+  configureQuickActions(quickActions: Array<ThreeDeeTouchQuickAction>): void { }
 
   /**
    * When a home icon is pressed, your app launches and this JS callback is invoked.
    * @returns {Observable<any>} returns an observable that notifies you when he user presses on the home screen icon
    */
   @CordovaFunctionOverride()
-  onHomeIconPressed(): Observable<any> {
-    return;
-  }
+  onHomeIconPressed(): Observable<any> { return; }
 
   /**
    * Enable Link Preview.
@@ -178,7 +172,7 @@ export class ThreeDeeTouch extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  enableLinkPreview(): void {}
+  enableLinkPreview(): void { }
 
   /**
    * Disabled the link preview feature, if enabled.
@@ -186,5 +180,6 @@ export class ThreeDeeTouch extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  disableLinkPreview(): void {}
+  disableLinkPreview(): void { }
+
 }
diff --git a/src/@ionic-native/plugins/toast/index.ts b/src/@ionic-native/plugins/toast/index.ts
index ba7a92252..41d5a443e 100644
--- a/src/@ionic-native/plugins/toast/index.ts
+++ b/src/@ionic-native/plugins/toast/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface ToastOptions {
@@ -69,6 +69,7 @@ export interface ToastOptions {
 })
 @Injectable()
 export class Toast extends IonicNativePlugin {
+
   /**
    * Show a native toast for the given duration at the specified position.
    *
@@ -81,18 +82,14 @@ export class Toast extends IonicNativePlugin {
     observable: true,
     clearFunction: 'hide'
   })
-  show(message: string, duration: string, position: string): Observable<any> {
-    return;
-  }
+  show(message: string, duration: string, position: string): Observable<any> { return; }
 
   /**
    * Manually hide any currently visible toast.
    * @returns {Promise<any>} Returns a Promise that resolves on success.
    */
   @Cordova()
-  hide(): Promise<any> {
-    return;
-  }
+  hide(): Promise<any> { return; }
 
   /**
    * Show a native toast with the given options.
@@ -109,9 +106,7 @@ export class Toast extends IonicNativePlugin {
     observable: true,
     clearFunction: 'hide'
   })
-  showWithOptions(options: ToastOptions): Observable<any> {
-    return;
-  }
+  showWithOptions(options: ToastOptions): Observable<any> { return; }
 
   /**
    * Shorthand for `show(message, 'short', 'top')`.
@@ -122,9 +117,7 @@ export class Toast extends IonicNativePlugin {
     observable: true,
     clearFunction: 'hide'
   })
-  showShortTop(message: string): Observable<any> {
-    return;
-  }
+  showShortTop(message: string): Observable<any> { return; }
 
   /**
    * Shorthand for `show(message, 'short', 'center')`.
@@ -135,9 +128,8 @@ export class Toast extends IonicNativePlugin {
     observable: true,
     clearFunction: 'hide'
   })
-  showShortCenter(message: string): Observable<any> {
-    return;
-  }
+  showShortCenter(message: string): Observable<any> { return; }
+
 
   /**
    * Shorthand for `show(message, 'short', 'bottom')`.
@@ -148,9 +140,8 @@ export class Toast extends IonicNativePlugin {
     observable: true,
     clearFunction: 'hide'
   })
-  showShortBottom(message: string): Observable<any> {
-    return;
-  }
+  showShortBottom(message: string): Observable<any> { return; }
+
 
   /**
    * Shorthand for `show(message, 'long', 'top')`.
@@ -161,9 +152,8 @@ export class Toast extends IonicNativePlugin {
     observable: true,
     clearFunction: 'hide'
   })
-  showLongTop(message: string): Observable<any> {
-    return;
-  }
+  showLongTop(message: string): Observable<any> { return; }
+
 
   /**
    * Shorthand for `show(message, 'long', 'center')`.
@@ -174,9 +164,8 @@ export class Toast extends IonicNativePlugin {
     observable: true,
     clearFunction: 'hide'
   })
-  showLongCenter(message: string): Observable<any> {
-    return;
-  }
+  showLongCenter(message: string): Observable<any> { return; }
+
 
   /**
    * Shorthand for `show(message, 'long', 'bottom')`.
@@ -187,7 +176,6 @@ export class Toast extends IonicNativePlugin {
     observable: true,
     clearFunction: 'hide'
   })
-  showLongBottom(message: string): Observable<any> {
-    return;
-  }
+  showLongBottom(message: string): Observable<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/touch-id/index.ts b/src/@ionic-native/plugins/touch-id/index.ts
index 34f5f9ca2..5d411d663 100644
--- a/src/@ionic-native/plugins/touch-id/index.ts
+++ b/src/@ionic-native/plugins/touch-id/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name Touch ID
@@ -51,15 +52,14 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class TouchID extends IonicNativePlugin {
+
   /**
    * Checks Whether TouchID is available or not.
    *
    * @returns {Promise<any>} Returns a Promise that resolves if yes, rejects if no.
    */
   @Cordova()
-  isAvailable(): Promise<any> {
-    return;
-  }
+  isAvailable(): Promise<any> { return; }
 
   /**
    * Show TouchID dialog and wait for a fingerprint scan. If user taps 'Enter Password' button, brings up standard system passcode screen.
@@ -68,9 +68,7 @@ export class TouchID extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise the resolves if the fingerprint scan was successful, rejects with an error code (see above).
    */
   @Cordova()
-  verifyFingerprint(message: string): Promise<any> {
-    return;
-  }
+  verifyFingerprint(message: string): Promise<any> { return; }
 
   /**
    * Show TouchID dialog and wait for a fingerprint scan. If user taps 'Enter Password' button, rejects with code '-3' (see above).
@@ -79,9 +77,7 @@ export class TouchID extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise the resolves if the fingerprint scan was successful, rejects with an error code (see above).
    */
   @Cordova()
-  verifyFingerprintWithCustomPasswordFallback(message: string): Promise<any> {
-    return;
-  }
+  verifyFingerprintWithCustomPasswordFallback(message: string): Promise<any> { return; }
 
   /**
    * Show TouchID dialog with custom 'Enter Password' message and wait for a fingerprint scan. If user taps 'Enter Password' button, rejects with code '-3' (see above).
@@ -91,12 +87,7 @@ export class TouchID extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise the resolves if the fingerprint scan was successful, rejects with an error code (see above).
    */
   @Cordova()
-  verifyFingerprintWithCustomPasswordFallbackAndEnterPasswordLabel(
-    message: string,
-    enterPasswordLabel: string
-  ): Promise<any> {
-    return;
-  }
+  verifyFingerprintWithCustomPasswordFallbackAndEnterPasswordLabel(message: string, enterPasswordLabel: string): Promise<any> { return; }
 
   /**
    * Checks if the fingerprint database changed.
@@ -104,7 +95,6 @@ export class TouchID extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves if yes, rejects if no.
    */
   @Cordova()
-  didFingerprintDatabaseChange(): Promise<any> {
-    return;
-  }
+  didFingerprintDatabaseChange(): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/twitter-connect/index.ts b/src/@ionic-native/plugins/twitter-connect/index.ts
index 4884b9d72..6ed25c92a 100644
--- a/src/@ionic-native/plugins/twitter-connect/index.ts
+++ b/src/@ionic-native/plugins/twitter-connect/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface TwitterConnectResponse {
   /**
@@ -56,8 +56,7 @@ export interface TwitterConnectResponse {
   plugin: 'twitter-connect-plugin',
   pluginRef: 'TwitterConnect',
   repo: 'https://github.com/chroa/twitter-connect-plugin',
-  install:
-    'ionic cordova plugin add https://github.com/chroa/twitter-connect-plugin --variable FABRIC_KEY=<Fabric API Key> --variable TWITTER_KEY=<Twitter Consumer Key> --variable TWITTER_SECRET=<Twitter Consumer Secret>',
+  install: 'ionic cordova plugin add https://github.com/chroa/twitter-connect-plugin --variable FABRIC_KEY=<Fabric API Key> --variable TWITTER_KEY=<Twitter Consumer Key> --variable TWITTER_SECRET=<Twitter Consumer Secret>',
   installVariables: ['FABRIC_KEY', 'TWITTER_KEY', 'TWITTER_SECRET'],
   platforms: ['Android', 'iOS']
 })
@@ -68,24 +67,18 @@ export class TwitterConnect extends IonicNativePlugin {
    * @returns {Promise<TwitterConnectResponse>} returns a promise that resolves if logged in and rejects if failed to login
    */
   @Cordova()
-  login(): Promise<TwitterConnectResponse> {
-    return;
-  }
+  login(): Promise<TwitterConnectResponse> { return; }
   /**
    * Logs out
    * @returns {Promise<any>} returns a promise that resolves if logged out and rejects if failed to logout
    */
   @Cordova()
-  logout(): Promise<any> {
-    return;
-  }
+  logout(): Promise<any> { return; }
 
   /**
    * Returns user's profile information
    * @returns {Promise<any>} returns a promise that resolves if user profile is successfully retrieved and rejects if request fails
    */
   @Cordova()
-  showUser(): Promise<any> {
-    return;
-  }
+  showUser(): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/uid/index.ts b/src/@ionic-native/plugins/uid/index.ts
index e7e9f330f..aa417a832 100644
--- a/src/@ionic-native/plugins/uid/index.ts
+++ b/src/@ionic-native/plugins/uid/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, CordovaProperty, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Uid
@@ -13,12 +13,12 @@ import { CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
  *
  * constructor(private uid: Uid, private androidPermissions: AndroidPermissions) { }
  *
- *
+ * 
  * async getImei() {
  *  const { hasPermission } = await this.androidPermissions.checkPermission(
  *    this.androidPermissions.PERMISSION.READ_PHONE_STATE
  *  );
- *
+ *  
  *  if (!hasPermission) {
  *    const result = await this.androidPermissions.requestPermission(
  *      this.androidPermissions.PERMISSION.READ_PHONE_STATE
@@ -27,11 +27,11 @@ import { CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
  *    if (!result.hasPermission) {
  *      throw new Error('Permissions required');
  *    }
- *
+ * 
  *    // ok, a user gave us permission, we can get him identifiers after restart app
  *    return;
  *  }
- *
+ * 
  *   return this.uid.IMEI
  * }
  * ```
@@ -45,18 +45,25 @@ import { CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Uid extends IonicNativePlugin {
+
   /** Get the device Universally Unique Identifier (UUID). */
-  @CordovaProperty UUID: string;
+  @CordovaProperty
+  UUID: string;
 
   /** Get the device International Mobile Station Equipment Identity (IMEI). */
-  @CordovaProperty IMEI: string;
+  @CordovaProperty
+  IMEI: string;
 
   /** Get the device International mobile Subscriber Identity (IMSI). */
-  @CordovaProperty IMSI: string;
+  @CordovaProperty
+  IMSI: string;
 
   /** Get the sim Integrated Circuit Card Identifier (ICCID). */
-  @CordovaProperty ICCID: string;
+  @CordovaProperty
+  ICCID: string;
 
   /** Get the Media Access Control address (MAC). */
-  @CordovaProperty MAC: string;
+  @CordovaProperty
+  MAC: string;
+
 }
diff --git a/src/@ionic-native/plugins/unique-device-id/index.ts b/src/@ionic-native/plugins/unique-device-id/index.ts
index cb1463016..4773aa006 100644
--- a/src/@ionic-native/plugins/unique-device-id/index.ts
+++ b/src/@ionic-native/plugins/unique-device-id/index.ts
@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Unique Device ID
@@ -29,12 +29,12 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class UniqueDeviceID extends IonicNativePlugin {
+
   /**
    * Gets a unique, cross-install, app-specific device id.
    * @return {Promise<string>} Returns a promise that resolves when something happens
    */
   @Cordova()
-  get(): Promise<string> {
-    return;
-  }
+  get(): Promise<string> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/user-agent/index.ts b/src/@ionic-native/plugins/user-agent/index.ts
index ec6fd5ea9..1a87f1f72 100644
--- a/src/@ionic-native/plugins/user-agent/index.ts
+++ b/src/@ionic-native/plugins/user-agent/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name User Agent
@@ -41,6 +41,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class UserAgent extends IonicNativePlugin {
+
   /**
    * Changes the current user-agent to the one sent by argument.
    * @param userAgent {string} User-Agent
@@ -68,4 +69,5 @@ export class UserAgent extends IonicNativePlugin {
   reset(): Promise<any> {
     return;
   }
+
 }
diff --git a/src/@ionic-native/plugins/vibration/index.ts b/src/@ionic-native/plugins/vibration/index.ts
index df55e2a11..5d83e9da7 100644
--- a/src/@ionic-native/plugins/vibration/index.ts
+++ b/src/@ionic-native/plugins/vibration/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name Vibration
@@ -36,6 +37,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Vibration extends IonicNativePlugin {
+
   /**
    * Vibrates the device for given amount of time.
    * @param time {number|Array<number>} Milliseconds to vibrate the device. If passed an array of numbers, it will define a vibration pattern. Pass 0 to stop any vibration immediately.
@@ -43,5 +45,6 @@ export class Vibration extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  vibrate(time: number | Array<number>) {}
+  vibrate(time: number | Array<number>) { }
+
 }
diff --git a/src/@ionic-native/plugins/video-capture-plus/index.ts b/src/@ionic-native/plugins/video-capture-plus/index.ts
index ac9e37098..7969aa9c1 100644
--- a/src/@ionic-native/plugins/video-capture-plus/index.ts
+++ b/src/@ionic-native/plugins/video-capture-plus/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface MediaFile {
   /**
@@ -30,10 +30,7 @@ export interface MediaFile {
    * @param {Function} successCallback
    * @param {Function} [errorCallback]
    */
-  getFormatData(
-    successCallback: (data: MediaFileData) => any,
-    errorCallback?: (err: any) => any
-  ): any;
+  getFormatData(successCallback: (data: MediaFileData) => any, errorCallback?: (err: any) => any): any;
 }
 
 export interface MediaFileData {
@@ -60,41 +57,43 @@ export interface MediaFileData {
 }
 
 export interface VideoCapturePlusOptions {
+
   /**
-   * The number of videos to record, default 1 (on iOS always 1)
-   */
+  * The number of videos to record, default 1 (on iOS always 1)
+  */
   limit?: number;
 
   /**
-   * Max duration in seconds, default 0, which is 'forever'
-   */
+  * Max duration in seconds, default 0, which is 'forever'
+  */
   duration?: number;
 
   /**
-   * Set to true to override the default low quality setting
-   */
+  * Set to true to override the default low quality setting
+  */
   highquality?: boolean;
 
   /**
-   * Set to true to override the default backfacing camera setting.
-   * You'll want to sniff the useragent/device and pass the best overlay based on that.. assuming iphone here
-   */
+  * Set to true to override the default backfacing camera setting.
+  * You'll want to sniff the useragent/device and pass the best overlay based on that.. assuming iphone here
+  */
   frontcamera?: boolean;
 
   /**
-   * put the png overlay in your assets folder
-   */
+  * put the png overlay in your assets folder
+  */
   portraitOverlay?: string;
 
   /**
-   *  not passing an overlay means no image is shown for the landscape orientation
-   */
+  *  not passing an overlay means no image is shown for the landscape orientation
+  */
   landscapeOverlay?: string;
 
   /**
-   * iOS only
-   */
+  * iOS only
+  */
   overlayText?: string;
+
 }
 
 /**
@@ -139,6 +138,7 @@ export interface VideoCapturePlusOptions {
 })
 @Injectable()
 export class VideoCapturePlus extends IonicNativePlugin {
+
   /**
    * Starts recordings
    * @param [options] {VideoCapturePlusOptions} Configure options
@@ -147,7 +147,6 @@ export class VideoCapturePlus extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  captureVideo(options?: VideoCapturePlusOptions): Promise<MediaFile[]> {
-    return;
-  }
+  captureVideo(options?: VideoCapturePlusOptions): Promise<MediaFile[]> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/video-editor/index.ts b/src/@ionic-native/plugins/video-editor/index.ts
index f767c0344..16af70d2e 100644
--- a/src/@ionic-native/plugins/video-editor/index.ts
+++ b/src/@ionic-native/plugins/video-editor/index.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface TranscodeOptions {
+
   /** The path to the video on the device. */
   fileUri: string;
 
@@ -49,6 +50,7 @@ export interface TranscodeOptions {
 }
 
 export interface TrimOptions {
+
   /** Path to input video. */
   fileUri: string;
 
@@ -63,9 +65,11 @@ export interface TrimOptions {
 
   /** Progress on transcode. info will be a number from 0 to 100 */
   progress?: (info: any) => void;
+
 }
 
 export interface CreateThumbnailOptions {
+
   /** The path to the video on the device */
   fileUri: string;
 
@@ -83,14 +87,18 @@ export interface CreateThumbnailOptions {
 
   /** Quality of the thumbnail (between 1 and 100). */
   quality?: number;
+
 }
 
 export interface GetVideoInfoOptions {
+
   /** The path to the video on the device. */
   fileUri: string;
+
 }
 
 export interface VideoInfo {
+
   /** Width of the video in pixels. */
   width: number;
 
@@ -108,6 +116,7 @@ export interface VideoInfo {
 
   /** Bitrate of the video in bits per second. */
   bitrate: number;
+
 }
 
 /**
@@ -147,6 +156,7 @@ export interface VideoInfo {
 })
 @Injectable()
 export class VideoEditor extends IonicNativePlugin {
+
   OptimizeForNetworkUse = {
     NO: 0,
     YES: 1
@@ -167,9 +177,7 @@ export class VideoEditor extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  transcodeVideo(options: TranscodeOptions): Promise<string> {
-    return;
-  }
+  transcodeVideo(options: TranscodeOptions): Promise<string> { return; }
 
   /**
    * Trim a video
@@ -180,9 +188,7 @@ export class VideoEditor extends IonicNativePlugin {
     callbackOrder: 'reverse',
     platforms: ['iOS']
   })
-  trim(options: TrimOptions): Promise<string> {
-    return;
-  }
+  trim(options: TrimOptions): Promise<string> { return; }
 
   /**
    * Create a JPEG thumbnail from a video
@@ -192,9 +198,7 @@ export class VideoEditor extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  createThumbnail(options: CreateThumbnailOptions): Promise<string> {
-    return;
-  }
+  createThumbnail(options: CreateThumbnailOptions): Promise<string> { return; }
 
   /**
    * Get info on a video (width, height, orientation, duration, size, & bitrate)
@@ -204,7 +208,6 @@ export class VideoEditor extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getVideoInfo(options: GetVideoInfoOptions): Promise<VideoInfo> {
-    return;
-  }
+  getVideoInfo(options: GetVideoInfoOptions): Promise<VideoInfo> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/video-player/index.ts b/src/@ionic-native/plugins/video-player/index.ts
index d80dd2018..e45fbf448 100644
--- a/src/@ionic-native/plugins/video-player/index.ts
+++ b/src/@ionic-native/plugins/video-player/index.ts
@@ -1,14 +1,14 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * Options for the video playback using the `play` function.
  */
 export interface VideoOptions {
   /**
-   * Set the initial volume of the video playback, where 0.0 is 0% volume and 1.0 is 100%.
-   * For example: for a volume of 30% set the value to 0.3.
-   */
+ * Set the initial volume of the video playback, where 0.0 is 0% volume and 1.0 is 100%.
+ * For example: for a volume of 30% set the value to 0.3.
+ */
   volume?: number;
   /**
    * There are two options for the scaling mode. SCALE_TO_FIT which is default and SCALE_TO_FIT_WITH_CROPPING.
@@ -52,6 +52,7 @@ export interface VideoOptions {
 })
 @Injectable()
 export class VideoPlayer extends IonicNativePlugin {
+
   /**
    * Plays the video from the passed url.
    * @param fileUrl {string} File url to the video.
@@ -59,13 +60,11 @@ export class VideoPlayer extends IonicNativePlugin {
    * @returns {Promise<any>} Resolves promise when the video was played successfully.
    */
   @Cordova()
-  play(fileUrl: string, options?: VideoOptions): Promise<any> {
-    return;
-  }
+  play(fileUrl: string, options?: VideoOptions): Promise<any> { return; }
 
   /**
    * Stops the video playback immediatly.
    */
   @Cordova({ sync: true })
-  close(): void {}
+  close(): void { }
 }
diff --git a/src/@ionic-native/plugins/web-intent/index.ts b/src/@ionic-native/plugins/web-intent/index.ts
index 8ec269c9b..7bd06c562 100644
--- a/src/@ionic-native/plugins/web-intent/index.ts
+++ b/src/@ionic-native/plugins/web-intent/index.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
+import { Cordova, CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -35,8 +30,7 @@ import { Observable } from 'rxjs/Observable';
   pluginName: 'WebIntent',
   plugin: 'com-darryncampbell-cordova-plugin-intent',
   pluginRef: 'plugins.intentShim',
-  repo:
-    'https://github.com/darryncampbell/darryncampbell-cordova-plugin-intent',
+  repo: 'https://github.com/darryncampbell/darryncampbell-cordova-plugin-intent',
   platforms: ['Android']
 })
 @Injectable()
diff --git a/src/@ionic-native/plugins/wheel-selector/index.ts b/src/@ionic-native/plugins/wheel-selector/index.ts
index a41b8be6b..5f5f787fa 100644
--- a/src/@ionic-native/plugins/wheel-selector/index.ts
+++ b/src/@ionic-native/plugins/wheel-selector/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface WheelSelectorItem {
   description?: string;
@@ -55,7 +55,7 @@ export interface WheelSelectorOptions {
    * key/value to be displayed
    * Default: description
    */
-  displayKey?: string;
+   displayKey?: string;
 }
 
 export interface WheelSelectorData {
@@ -155,7 +155,7 @@ export interface WheelSelectorData {
  *      ],
  *      displayKey: 'name',
  *      defaultItems: [
- *  	  {index:0, value: this.jsonData.firstNames[2].name},
+ *  	  {index:0, value: this.jsonData.firstNames[2].name}, 
  *        {index: 0, value: this.jsonData.lastNames[3].name}
  *      ]
  *    }).then(
@@ -179,8 +179,10 @@ export interface WheelSelectorData {
   repo: 'https://github.com/jasonmamy/cordova-wheel-selector-plugin',
   platforms: ['Android', 'iOS']
 })
+
 @Injectable()
 export class WheelSelector extends IonicNativePlugin {
+
   /**
    * Shows the wheel selector
    * @param {WheelSelectorOptions} options Options for the wheel selector
@@ -198,7 +200,5 @@ export class WheelSelector extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  hideSelector(): Promise<void> {
-    return;
-  }
+  hideSelector(): Promise<void> { return; }
 }
diff --git a/src/@ionic-native/plugins/youtube-video-player/index.ts b/src/@ionic-native/plugins/youtube-video-player/index.ts
index c909296f9..6b458594c 100644
--- a/src/@ionic-native/plugins/youtube-video-player/index.ts
+++ b/src/@ionic-native/plugins/youtube-video-player/index.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 /**
  * @name Youtube Video Player
  * @description
@@ -35,10 +34,12 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class YoutubeVideoPlayer extends IonicNativePlugin {
+
   /**
    * Plays a YouTube video
    * @param videoId {string} Video ID
    */
   @Cordova({ sync: true })
-  openVideo(videoId: string): void {}
+  openVideo(videoId: string): void { }
+
 }
diff --git a/src/@ionic-native/plugins/zbar/index.ts b/src/@ionic-native/plugins/zbar/index.ts
index 724459bcc..3fb463c8d 100644
--- a/src/@ionic-native/plugins/zbar/index.ts
+++ b/src/@ionic-native/plugins/zbar/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface ZBarOptions {
   /**
@@ -77,13 +77,13 @@ export interface ZBarOptions {
 })
 @Injectable()
 export class ZBar extends IonicNativePlugin {
+
   /**
    * Open the scanner
    * @param options { ZBarOptions } Scan options
    * @returns {Promise<any>} Returns a Promise that resolves with the scanned string, or rejects with an error.
    */
   @Cordova()
-  scan(options: ZBarOptions): Promise<any> {
-    return;
-  }
+  scan(options: ZBarOptions): Promise<any> { return; }
+
 }
diff --git a/src/@ionic-native/plugins/zeroconf/index.ts b/src/@ionic-native/plugins/zeroconf/index.ts
index 4fde9656f..63ce74574 100644
--- a/src/@ionic-native/plugins/zeroconf/index.ts
+++ b/src/@ionic-native/plugins/zeroconf/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface ZeroconfService {
@@ -65,9 +65,7 @@ export class Zeroconf extends IonicNativePlugin {
    * @return {Promise<string>}
    */
   @Cordova()
-  getHostname(): Promise<string> {
-    return;
-  }
+  getHostname(): Promise<string> { return; }
 
   /**
    * Publishes a new service.
@@ -79,15 +77,7 @@ export class Zeroconf extends IonicNativePlugin {
    * @return {Promise<ZeroconfResult>} Returns a Promise that resolves with the registered service.
    */
   @Cordova()
-  register(
-    type: string,
-    domain: string,
-    name: string,
-    port: number,
-    txtRecord: any
-  ): Promise<ZeroconfResult> {
-    return;
-  }
+  register(type: string, domain: string, name: string, port: number, txtRecord: any): Promise<ZeroconfResult> { return; }
 
   /**
    * Unregisters a service.
@@ -97,18 +87,14 @@ export class Zeroconf extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  unregister(type: string, domain: string, name: string): Promise<void> {
-    return;
-  }
+  unregister(type: string, domain: string, name: string): Promise<void> { return; }
 
   /**
    * Unregisters all published services.
    * @return {Promise<void>}
    */
   @Cordova()
-  stop(): Promise<void> {
-    return;
-  }
+  stop(): Promise<void> { return; }
 
   /**
    * Starts watching for services of the specified type.
@@ -121,9 +107,7 @@ export class Zeroconf extends IonicNativePlugin {
     clearFunction: 'unwatch',
     clearWithArgs: true
   })
-  watch(type: string, domain: string): Observable<ZeroconfResult> {
-    return;
-  }
+  watch(type: string, domain: string): Observable<ZeroconfResult> { return; }
 
   /**
    * Stops watching for services of the specified type.
@@ -132,25 +116,19 @@ export class Zeroconf extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  unwatch(type: string, domain: string): Promise<void> {
-    return;
-  }
+  unwatch(type: string, domain: string): Promise<void> { return; }
 
   /**
    * Closes the service browser and stops watching.
    * @return {Promise<void>}
    */
   @Cordova()
-  close(): Promise<void> {
-    return;
-  }
+  close(): Promise<void> { return; }
 
   /**
    * Re-initializes the plugin to clean service & browser state.
    * @return {Promise<void>}
    */
   @Cordova()
-  reInit(): Promise<void> {
-    return;
-  }
+  reInit(): Promise<void> { return; }
 }
diff --git a/src/@ionic-native/plugins/zip/index.ts b/src/@ionic-native/plugins/zip/index.ts
index 9bea88ec7..7fc038016 100644
--- a/src/@ionic-native/plugins/zip/index.ts
+++ b/src/@ionic-native/plugins/zip/index.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Zip
@@ -31,6 +31,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Zip extends IonicNativePlugin {
+
   /**
    * Extracts files from a ZIP archive
    * @param sourceZip {string} Source ZIP file
@@ -42,11 +43,6 @@ export class Zip extends IonicNativePlugin {
     successIndex: 2,
     errorIndex: 4
   })
-  unzip(
-    sourceZip: string,
-    destUrl: string,
-    onProgress?: Function
-  ): Promise<number> {
-    return;
-  }
+  unzip(sourceZip: string, destUrl: string, onProgress?: Function): Promise<number> { return; }
+
 }