CB-11550 Updated RELEASENOTES for release 5.2.1

CB-11550 Set VERSION to 5.2.1 (via coho)
CB-11550 Update JS snapshot to version 5.2.1 (via coho)
2026-01-30 00:05:28 +08:00 · 2016-07-11 13:43:57 +03:00 · 2016-07-11 13:43:57 +03:00 · 2016-07-11 13:43:57 +03:00 · 2016-07-11 13:41:00 +03:00 · 2016-07-11 13:11:04 +03:00
62 changed files with 963 additions and 1846 deletions
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,10 @@
 -->
 ## Release Notes for Cordova (Android) ##

+### 5.2.1 (Jul 11, 2016)
+* [CB-9489](https://issues.apache.org/jira/browse/CB-9489) Fixed "endless waiting for emulator" issue
+* [CB-11481](https://issues.apache.org/jira/browse/CB-11481) android-library is deprecated use com.android.library instead
+
 ### 5.2.0 (Jun 29, 2016)
 * [CB-11383](https://issues.apache.org/jira/browse/CB-11383) Update to gradle for using `jcenter` and correct Application plugin
 * [CB-11365](https://issues.apache.org/jira/browse/CB-11365) fixed plugin rm issue with emit being `undefined`
@@ -68,7 +72,7 @@
 * [CB-10443](https://issues.apache.org/jira/browse/CB-10443) Fix `this.root` null reference
 * [CB-10421](https://issues.apache.org/jira/browse/CB-10421) Fixes exception when calling run script with `--help` option
 * updated `.gitignore`
-* [CB-10406](https://issues.apache.org/jira/browse/CB-10406) Fixes an exception, thrown when building using Ant. 
+* [CB-10406](https://issues.apache.org/jira/browse/CB-10406) Fixes an exception, thrown when building using Ant.
 * [CB-10157](https://issues.apache.org/jira/browse/CB-10157) Uninstall app from device/emulator only when signed apk is already installed

 ### 5.1.0 (Jan 19, 2016)
@@ -78,7 +82,7 @@
 * Update theme to `Theme.DeviceDefault.NoActionBar`
 * [CB-10014](https://issues.apache.org/jira/browse/CB-10014) Set gradle `applicationId` to `package name`.
 * [CB-9949](https://issues.apache.org/jira/browse/CB-9949) Fixing menu button event not fired in **Android**
-* [CB-9479](https://issues.apache.org/jira/browse/CB-9479) Fixing the conditionals again, we should 
+* [CB-9479](https://issues.apache.org/jira/browse/CB-9479) Fixing the conditionals again, we should
 * [CB-8917](https://issues.apache.org/jira/browse/CB-8917) New Plugin API for passing results on resume after Activity destruction
 * [CB-9971](https://issues.apache.org/jira/browse/CB-9971) Suppress `gradlew _JAVA_OPTIONS` output during build
 * [CB-9836](https://issues.apache.org/jira/browse/CB-9836) Add `.gitattributes` to prevent `CRLF` line endings in repos
@@ -95,7 +99,7 @@
 * Adds licence header to Adb to pass rat audit
 * [CB-9835](https://issues.apache.org/jira/browse/CB-9835) Downgrade `properties-parser` to prevent failures in Node < 4.x
 * [CB-9782](https://issues.apache.org/jira/browse/CB-9782) Implements PlatformApi contract for Android platform.
-* [CB-9826](https://issues.apache.org/jira/browse/CB-9826) Fixed `test-build` script on windows. 
+* [CB-9826](https://issues.apache.org/jira/browse/CB-9826) Fixed `test-build` script on windows.
 * Refactor of the Cordova Plugin/Permissions API
 * Manually updating version to 5.0.0-dev for engine tags
 * Bump up to API level 23
@@ -110,7 +114,7 @@
 * [CB-9172](https://issues.apache.org/jira/browse/CB-9172) Improved emulator deploy stability. This closes #188.
 * [CB-9404](https://issues.apache.org/jira/browse/CB-9404) Fixed an exception when path contained -debug or -release
 * [CB-8320](https://issues.apache.org/jira/browse/CB-8320) Setting up gradle so we can use CordovaLib as a standard Android Library
-* [CB-9185](https://issues.apache.org/jira/browse/CB-9185) Fixed an issue when unsigned apks couldn't be found. 
+* [CB-9185](https://issues.apache.org/jira/browse/CB-9185) Fixed an issue when unsigned apks couldn't be found.
 * [CB-9397](https://issues.apache.org/jira/browse/CB-9397) Fixes minor issues with `cordova requirements android`
 * [CB-9389](https://issues.apache.org/jira/browse/CB-9389) Fixes build/check_reqs hang

@@ -177,7 +181,7 @@

 * Removed Intent Functionality from Preferences - Preferences can no longer be set by intents

-### Release 4.0.1 (April 2015) ### 
+### Release 4.0.1 (April 2015) ###

 * Bug fixed where platform failed to install on a version downgrade

--- a/2
+++ b/2
@@ -1 +1 @@
-5.2.0
+5.2.1
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -147,6 +147,25 @@ module.exports.list_targets = function() {
    });
 };

+/*
+ * Gets unused port for android emulator, between 5554 and 5584
+ * Returns a promise.
+ */
+module.exports.get_available_port = function () {
+    var self = this;
+
+    return self.list_started()
+    .then(function (emulators) {
+        for (var p = 5584; p >= 5554; p-=2) {
+            if (emulators.indexOf('emulator-' + p) === -1) {
+                events.emit('verbose', 'Found available port: ' + p);
+                return p;
+            }
+        }
+        throw new CordovaError('Could not find an available avd port');
+    });
+};
+
 /*
 * Starts an emulator with the given ID,
 * and returns the started ID of that emulator.
@@ -178,17 +197,18 @@ module.exports.start = function(emulator_ID, boot_timeout) {
                'HINT: For a faster emulator, use an Intel System Image and install the HAXM device driver\n'));
        });
    }).then(function(emulatorId) {
-        var uuid = 'cordova_emulator_' + new Date().getTime();
-        var uuidProp = 'emu.uuid=' + uuid;
-        var args = ['-avd', emulatorId, '-prop', uuidProp];
-        // Don't wait for it to finish, since the emulator will probably keep running for a long time.
-        child_process
-            .spawn('emulator', args, { stdio: 'inherit', detached: true })
-            .unref();
+        return self.get_available_port()
+        .then(function (port) {
+            var args = ['-avd', emulatorId, '-port', port];
+            // Don't wait for it to finish, since the emulator will probably keep running for a long time.
+            child_process
+                .spawn('emulator', args, { stdio: 'inherit', detached: true })
+                .unref();

-        // wait for emulator to start
-        events.emit('log', 'Waiting for emulator to start...');
-        return self.wait_for_emulator(uuid);
+            // wait for emulator to start
+            events.emit('log', 'Waiting for emulator to start...');
+            return self.wait_for_emulator(port);
+        });
    }).then(function(emulatorId) {
        if (!emulatorId)
            return Q.reject(new CordovaError('Failed to start emulator'));
@@ -214,29 +234,29 @@ module.exports.start = function(emulator_ID, boot_timeout) {
 };

 /*
- * Waits for an emulator with given uuid to apear on the started-emulator list.
- * Returns a promise with this emulator's ID.
+ * Waits for an emulator to boot on a given port.
+ * Returns this emulator's ID in a promise.
 */
-module.exports.wait_for_emulator = function(uuid) {
+module.exports.wait_for_emulator = function(port) {
    var self = this;
-    return self.list_started()
-    .then(function(new_started) {
-        var emulator_id = null;
-        var promises = [];
-
-        new_started.forEach(function (emulator) {
-            promises.push(
-                Adb.shell(emulator, 'getprop emu.uuid')
-                .then(function (output) {
-                    if (output.indexOf(uuid) >= 0) {
-                        emulator_id = emulator;
-                    }
-                })
-            );
-        });
-
-        return Q.all(promises).then(function () {
-            return emulator_id || self.wait_for_emulator(uuid);
+    return Q().then(function() {
+        var emulator_id = 'emulator-' + port;
+        return Adb.shell(emulator_id, 'getprop dev.bootcomplete')
+        .then(function (output) {
+            if (output.indexOf('1') >= 0) {
+                return emulator_id;
+            }
+            return self.wait_for_emulator(port);
+        }, function (error) {
+            if (error && error.message &&
+            (error.message.indexOf('not found') > -1) ||
+            error.message.indexOf('device offline') > -1) {
+                // emulator not yet started, continue waiting
+                return self.wait_for_emulator(port);
+            } else {
+                // something unexpected has happened
+                throw error;
+            }
        });
     });
 };
--- a/bin/templates/cordova/lib/plugin-build.gradle
+++ b/bin/templates/cordova/lib/plugin-build.gradle
@@ -42,7 +42,7 @@ buildscript {
    }
 }

-apply plugin: 'android-library'
+apply plugin: 'com.android.library'

 dependencies {
    compile fileTree(dir: 'libs', include: '*.jar')
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,7 +20,7 @@
 */

 // Coho updates this line:
-var VERSION = "5.2.0";
+var VERSION = "5.2.1";

 module.exports.version = VERSION;

--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -19,7 +19,7 @@
 under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '5.2.0';
+var PLATFORM_VERSION_BUILD_LABEL = '5.2.1';
 // file: src/scripts/require.js

 /*jshint -W079 */
@@ -330,7 +330,7 @@ module.exports = cordova;

 });

-// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
+// file: D:/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
 define("cordova/android/nativeapiprovider", function(require, exports, module) {

 /**
@@ -353,7 +353,7 @@ module.exports = {

 });

-// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
+// file: D:/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
 define("cordova/android/promptbasednativeapi", function(require, exports, module) {

 /**
@@ -862,7 +862,7 @@ module.exports = channel;

 });

-// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/exec.js
+// file: D:/cordova/cordova-android/cordova-js-src/exec.js
 define("cordova/exec", function(require, exports, module) {

 /**
@@ -1611,7 +1611,7 @@ exports.reset();

 });

-// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js
+// file: D:/cordova/cordova-android/cordova-js-src/platform.js
 define("cordova/platform", function(require, exports, module) {

 // The last resume event that was received that had the result of a plugin call.
@@ -1721,7 +1721,7 @@ function onMessageFromNative(msg) {

 });

-// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/plugin/android/app.js
+// file: D:/cordova/cordova-android/cordova-js-src/plugin/android/app.js
 define("cordova/plugin/android/app", function(require, exports, module) {

 var exec = require('cordova/exec');
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -29,7 +29,7 @@ buildscript {

 }

-apply plugin: 'android-library'
+apply plugin: 'com.android.library'

 ext {
    apply from: 'cordova.gradle'
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
 * are not expected to implement it.
 */
 public interface CordovaWebView {
-    public static final String CORDOVA_VERSION = "5.2.0";
+    public static final String CORDOVA_VERSION = "5.2.1";

    void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);

--- a/node_modules/abbrev/.npmignore
+++ b/node_modules/abbrev/.npmignore
@@ -1,4 +0,0 @@
-.nyc_output
-nyc_output
-node_modules
-coverage
--- a/node_modules/abbrev/.travis.yml
+++ b/node_modules/abbrev/.travis.yml
@@ -1,5 +0,0 @@
-language: node_js
-node_js:
-  - '0.10'
-  - '0.12'
-  - 'iojs'
--- a/node_modules/abbrev/CONTRIBUTING.md
+++ b/node_modules/abbrev/CONTRIBUTING.md
@@ -1,3 +0,0 @@
- To get started, <a
- href="http://www.clahub.com/agreements/isaacs/abbrev-js">sign the
- Contributor License Agreement</a>.
--- a/node_modules/abbrev/package.json
+++ b/node_modules/abbrev/package.json
@@ -1,41 +1,54 @@
 {
  "_args": [
    [
-      "abbrev@1",
-      "D:\\Cordova\\cordova-android\\node_modules\\nopt"
+      {
+        "raw": "abbrev@1",
+        "scope": null,
+        "escapedName": "abbrev",
+        "name": "abbrev",
+        "rawSpec": "1",
+        "spec": ">=1.0.0 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\nopt"
    ]
  ],
  "_from": "abbrev@>=1.0.0 <2.0.0",
-  "_id": "abbrev@1.0.7",
+  "_id": "abbrev@1.0.9",
  "_inCache": true,
  "_installable": true,
  "_location": "/abbrev",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
+  "_nodeVersion": "4.4.4",
+  "_npmOperationalInternal": {
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/abbrev-1.0.9.tgz_1466016055839_0.7825860097073019"
  },
-  "_npmVersion": "2.10.1",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
+  "_npmVersion": "3.9.1",
  "_phantomChildren": {},
  "_requested": {
-    "name": "abbrev",
    "raw": "abbrev@1",
-    "rawSpec": "1",
    "scope": null,
+    "escapedName": "abbrev",
+    "name": "abbrev",
+    "rawSpec": "1",
    "spec": ">=1.0.0 <2.0.0",
    "type": "range"
  },
  "_requiredBy": [
    "/nopt"
  ],
-  "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz",
-  "_shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843",
+  "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+  "_shasum": "91b4792588a7738c25f35dd6f63752a2f8776135",
  "_shrinkwrap": null,
  "_spec": "abbrev@1",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\nopt",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\nopt",
  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter"
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me"
  },
  "bugs": {
    "url": "https://github.com/isaacs/abbrev-js/issues"
@@ -43,21 +56,24 @@
  "dependencies": {},
  "description": "Like ruby's abbrev module, but in js",
  "devDependencies": {
-    "tap": "^1.2.0"
+    "tap": "^5.7.2"
  },
  "directories": {},
  "dist": {
-    "shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843",
-    "tarball": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+    "shasum": "91b4792588a7738c25f35dd6f63752a2f8776135",
+    "tarball": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"
  },
-  "gitHead": "821d09ce7da33627f91bbd8ed631497ed6f760c2",
+  "files": [
+    "abbrev.js"
+  ],
+  "gitHead": "c386cd9dbb1d8d7581718c54d4ba944cc9298d6f",
  "homepage": "https://github.com/isaacs/abbrev-js#readme",
  "license": "ISC",
  "main": "abbrev.js",
  "maintainers": [
    {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
    }
  ],
  "name": "abbrev",
@@ -70,5 +86,5 @@
  "scripts": {
    "test": "tap test.js --cov"
  },
-  "version": "1.0.7"
+  "version": "1.0.9"
 }
--- a/node_modules/abbrev/test.js
+++ b/node_modules/abbrev/test.js
@@ -1,47 +0,0 @@
-var abbrev = require('./abbrev.js')
-var assert = require("assert")
-var util = require("util")
-
-console.log("TAP version 13")
-var count = 0
-
-function test (list, expect) {
-  count++
-  var actual = abbrev(list)
-  assert.deepEqual(actual, expect,
-    "abbrev("+util.inspect(list)+") === " + util.inspect(expect) + "\n"+
-    "actual: "+util.inspect(actual))
-  actual = abbrev.apply(exports, list)
-  assert.deepEqual(abbrev.apply(exports, list), expect,
-    "abbrev("+list.map(JSON.stringify).join(",")+") === " + util.inspect(expect) + "\n"+
-    "actual: "+util.inspect(actual))
-  console.log('ok - ' + list.join(' '))
-}
-
-test([ "ruby", "ruby", "rules", "rules", "rules" ],
-{ rub: 'ruby'
-, ruby: 'ruby'
-, rul: 'rules'
-, rule: 'rules'
-, rules: 'rules'
-})
-test(["fool", "foom", "pool", "pope"],
-{ fool: 'fool'
-, foom: 'foom'
-, poo: 'pool'
-, pool: 'pool'
-, pop: 'pope'
-, pope: 'pope'
-})
-test(["a", "ab", "abc", "abcd", "abcde", "acde"],
-{ a: 'a'
-, ab: 'ab'
-, abc: 'abc'
-, abcd: 'abcd'
-, abcde: 'abcde'
-, ac: 'acde'
-, acd: 'acde'
-, acde: 'acde'
-})
-
-console.log("1..%d", count)
--- a/node_modules/ansi/package.json
+++ b/node_modules/ansi/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "ansi@^0.3.1",
-      "D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
+      {
+        "raw": "ansi@^0.3.1",
+        "scope": null,
+        "escapedName": "ansi",
+        "name": "ansi",
+        "rawSpec": "^0.3.1",
+        "spec": ">=0.3.1 <0.4.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "ansi@>=0.3.1 <0.4.0",
@@ -12,16 +20,17 @@
  "_location": "/ansi",
  "_nodeVersion": "5.3.0",
  "_npmUser": {
-    "email": "nathan@tootallnate.net",
-    "name": "tootallnate"
+    "name": "tootallnate",
+    "email": "nathan@tootallnate.net"
  },
  "_npmVersion": "3.3.12",
  "_phantomChildren": {},
  "_requested": {
-    "name": "ansi",
    "raw": "ansi@^0.3.1",
-    "rawSpec": "^0.3.1",
    "scope": null,
+    "escapedName": "ansi",
+    "name": "ansi",
+    "rawSpec": "^0.3.1",
    "spec": ">=0.3.1 <0.4.0",
    "type": "range"
  },
@@ -32,10 +41,10 @@
  "_shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21",
  "_shrinkwrap": null,
  "_spec": "ansi@^0.3.1",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
-    "email": "nathan@tootallnate.net",
    "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
    "url": "http://tootallnate.net"
  },
  "bugs": {
@@ -65,12 +74,12 @@
  "main": "./lib/ansi.js",
  "maintainers": [
    {
-      "email": "nathan@tootallnate.net",
-      "name": "TooTallNate"
+      "name": "TooTallNate",
+      "email": "nathan@tootallnate.net"
    },
    {
-      "email": "nathan@tootallnate.net",
-      "name": "tootallnate"
+      "name": "tootallnate",
+      "email": "nathan@tootallnate.net"
    }
  ],
  "name": "ansi",
--- a/node_modules/balanced-match/package.json
+++ b/node_modules/balanced-match/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "balanced-match@^0.4.1",
-      "D:\\Cordova\\cordova-android\\node_modules\\brace-expansion"
+      {
+        "raw": "balanced-match@^0.4.1",
+        "scope": null,
+        "escapedName": "balanced-match",
+        "name": "balanced-match",
+        "rawSpec": "^0.4.1",
+        "spec": ">=0.4.1 <0.5.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\brace-expansion"
    ]
  ],
  "_from": "balanced-match@>=0.4.1 <0.5.0",
@@ -16,16 +24,17 @@
    "tmp": "tmp/balanced-match-0.4.1.tgz_1462129663650_0.39764496590942144"
  },
  "_npmUser": {
-    "email": "julian@juliangruber.com",
-    "name": "juliangruber"
+    "name": "juliangruber",
+    "email": "julian@juliangruber.com"
  },
  "_npmVersion": "3.8.6",
  "_phantomChildren": {},
  "_requested": {
-    "name": "balanced-match",
    "raw": "balanced-match@^0.4.1",
-    "rawSpec": "^0.4.1",
    "scope": null,
+    "escapedName": "balanced-match",
+    "name": "balanced-match",
+    "rawSpec": "^0.4.1",
    "spec": ">=0.4.1 <0.5.0",
    "type": "range"
  },
@@ -36,10 +45,10 @@
  "_shasum": "19053e2e0748eadb379da6c09d455cf5e1039335",
  "_shrinkwrap": null,
  "_spec": "balanced-match@^0.4.1",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\brace-expansion",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\brace-expansion",
  "author": {
-    "email": "mail@juliangruber.com",
    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
    "url": "http://juliangruber.com"
  },
  "bugs": {
@@ -68,8 +77,8 @@
  "main": "index.js",
  "maintainers": [
    {
-      "email": "julian@juliangruber.com",
-      "name": "juliangruber"
+      "name": "juliangruber",
+      "email": "julian@juliangruber.com"
    }
  ],
  "name": "balanced-match",
@@ -83,6 +92,7 @@
    "test": "make test"
  },
  "testling": {
+    "files": "test/*.js",
    "browsers": [
      "ie/8..latest",
      "firefox/20..latest",
@@ -95,8 +105,7 @@
      "ipad/6.0..latest",
      "iphone/6.0..latest",
      "android-browser/4.2..latest"
-    ],
-    "files": "test/*.js"
+    ]
  },
  "version": "0.4.1"
 }
--- a/node_modules/base64-js/package.json
+++ b/node_modules/base64-js/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "base64-js@0.0.8",
-      "D:\\Cordova\\cordova-android\\node_modules\\plist"
+      {
+        "raw": "base64-js@0.0.8",
+        "scope": null,
+        "escapedName": "base64-js",
+        "name": "base64-js",
+        "rawSpec": "0.0.8",
+        "spec": "0.0.8",
+        "type": "version"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\plist"
    ]
  ],
  "_from": "base64-js@0.0.8",
@@ -12,16 +20,17 @@
  "_location": "/base64-js",
  "_nodeVersion": "0.10.35",
  "_npmUser": {
-    "email": "feross@feross.org",
-    "name": "feross"
+    "name": "feross",
+    "email": "feross@feross.org"
  },
  "_npmVersion": "2.1.16",
  "_phantomChildren": {},
  "_requested": {
-    "name": "base64-js",
    "raw": "base64-js@0.0.8",
-    "rawSpec": "0.0.8",
    "scope": null,
+    "escapedName": "base64-js",
+    "name": "base64-js",
+    "rawSpec": "0.0.8",
    "spec": "0.0.8",
    "type": "version"
  },
@@ -32,10 +41,10 @@
  "_shasum": "1101e9544f4a76b1bc3b26d452ca96d7a35e7978",
  "_shrinkwrap": null,
  "_spec": "base64-js@0.0.8",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\plist",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\plist",
  "author": {
-    "email": "t.jameson.little@gmail.com",
-    "name": "T. Jameson Little"
+    "name": "T. Jameson Little",
+    "email": "t.jameson.little@gmail.com"
  },
  "bugs": {
    "url": "https://github.com/beatgammit/base64-js/issues"
@@ -59,12 +68,12 @@
  "main": "lib/b64.js",
  "maintainers": [
    {
-      "email": "t.jameson.little@gmail.com",
-      "name": "beatgammit"
+      "name": "beatgammit",
+      "email": "t.jameson.little@gmail.com"
    },
    {
-      "email": "feross@feross.org",
-      "name": "feross"
+      "name": "feross",
+      "email": "feross@feross.org"
    }
  ],
  "name": "base64-js",
@@ -78,6 +87,7 @@
    "test": "tape test/*.js"
  },
  "testling": {
+    "files": "test/*.js",
    "browsers": [
      "ie/6..latest",
      "chrome/4..latest",
@@ -86,8 +96,7 @@
      "opera/11.0..latest",
      "iphone/6",
      "ipad/6"
-    ],
-    "files": "test/*.js"
+    ]
  },
  "version": "0.0.8"
 }
--- a/node_modules/big-integer/package.json
+++ b/node_modules/big-integer/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "big-integer@^1.6.7",
-      "D:\\Cordova\\cordova-android\\node_modules\\bplist-parser"
+      {
+        "raw": "big-integer@^1.6.7",
+        "scope": null,
+        "escapedName": "big-integer",
+        "name": "big-integer",
+        "rawSpec": "^1.6.7",
+        "spec": ">=1.6.7 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\bplist-parser"
    ]
  ],
  "_from": "big-integer@>=1.6.7 <2.0.0",
@@ -16,16 +24,17 @@
    "tmp": "tmp/big-integer-1.6.15.tgz_1460079231162_0.7087579960934818"
  },
  "_npmUser": {
-    "email": "peter.e.c.olson+npm@gmail.com",
-    "name": "peterolson"
+    "name": "peterolson",
+    "email": "peter.e.c.olson+npm@gmail.com"
  },
  "_npmVersion": "2.9.1",
  "_phantomChildren": {},
  "_requested": {
-    "name": "big-integer",
    "raw": "big-integer@^1.6.7",
-    "rawSpec": "^1.6.7",
    "scope": null,
+    "escapedName": "big-integer",
+    "name": "big-integer",
+    "rawSpec": "^1.6.7",
    "spec": ">=1.6.7 <2.0.0",
    "type": "range"
  },
@@ -36,10 +45,10 @@
  "_shasum": "33d27d3b7388dfcc4b86d3130c10740cec01fb9e",
  "_shrinkwrap": null,
  "_spec": "big-integer@^1.6.7",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\bplist-parser",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\bplist-parser",
  "author": {
-    "email": "peter.e.c.olson+npm@gmail.com",
-    "name": "Peter Olson"
+    "name": "Peter Olson",
+    "email": "peter.e.c.olson+npm@gmail.com"
  },
  "bin": {},
  "bugs": {
@@ -82,8 +91,8 @@
  "main": "./BigInteger",
  "maintainers": [
    {
-      "email": "peter.e.c.olson+npm@gmail.com",
-      "name": "peterolson"
+      "name": "peterolson",
+      "email": "peter.e.c.olson+npm@gmail.com"
    }
  ],
  "name": "big-integer",
--- a/node_modules/bplist-parser/package.json
+++ b/node_modules/bplist-parser/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "bplist-parser@^0.1.0",
-      "D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
+      {
+        "raw": "bplist-parser@^0.1.0",
+        "scope": null,
+        "escapedName": "bplist-parser",
+        "name": "bplist-parser",
+        "rawSpec": "^0.1.0",
+        "spec": ">=0.1.0 <0.2.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "bplist-parser@>=0.1.0 <0.2.0",
@@ -12,16 +20,17 @@
  "_location": "/bplist-parser",
  "_nodeVersion": "5.1.0",
  "_npmUser": {
-    "email": "joe@fernsroth.com",
-    "name": "joeferner"
+    "name": "joeferner",
+    "email": "joe@fernsroth.com"
  },
  "_npmVersion": "3.4.0",
  "_phantomChildren": {},
  "_requested": {
-    "name": "bplist-parser",
    "raw": "bplist-parser@^0.1.0",
-    "rawSpec": "^0.1.0",
    "scope": null,
+    "escapedName": "bplist-parser",
+    "name": "bplist-parser",
+    "rawSpec": "^0.1.0",
    "spec": ">=0.1.0 <0.2.0",
    "type": "range"
  },
@@ -32,10 +41,10 @@
  "_shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6",
  "_shrinkwrap": null,
  "_spec": "bplist-parser@^0.1.0",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
-    "email": "joe.ferner@nearinfinity.com",
-    "name": "Joe Ferner"
+    "name": "Joe Ferner",
+    "email": "joe.ferner@nearinfinity.com"
  },
  "bugs": {
    "url": "https://github.com/nearinfinity/node-bplist-parser/issues"
@@ -63,8 +72,8 @@
  "main": "bplistParser.js",
  "maintainers": [
    {
-      "email": "joe@fernsroth.com",
-      "name": "joeferner"
+      "name": "joeferner",
+      "email": "joe@fernsroth.com"
    }
  ],
  "name": "bplist-parser",
--- a/node_modules/brace-expansion/.npmignore
+++ b/node_modules/brace-expansion/.npmignore
@@ -1,3 +0,0 @@
-test
-.gitignore
-.travis.yml
--- a/node_modules/brace-expansion/example.js
+++ b/node_modules/brace-expansion/example.js
@@ -1,8 +0,0 @@
-var expand = require('./');
-
-console.log(expand('http://any.org/archive{1996..1999}/vol{1..4}/part{a,b,c}.html'));
-console.log(expand('http://www.numericals.com/file{1..100..10}.txt'));
-console.log(expand('http://www.letters.com/file{a..z..2}.txt'));
-console.log(expand('mkdir /usr/local/src/bash/{old,new,dist,bugs}'));
-console.log(expand('chown root /usr/{ucb/{ex,edit},lib/{ex?.?*,how_ex}}'));
-
--- a/node_modules/brace-expansion/package.json
+++ b/node_modules/brace-expansion/package.json
@@ -1,45 +1,54 @@
 {
  "_args": [
    [
-      "brace-expansion@^1.0.0",
-      "D:\\Cordova\\cordova-android\\node_modules\\minimatch"
+      {
+        "raw": "brace-expansion@^1.0.0",
+        "scope": null,
+        "escapedName": "brace-expansion",
+        "name": "brace-expansion",
+        "rawSpec": "^1.0.0",
+        "spec": ">=1.0.0 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\minimatch"
    ]
  ],
  "_from": "brace-expansion@>=1.0.0 <2.0.0",
-  "_id": "brace-expansion@1.1.4",
+  "_id": "brace-expansion@1.1.5",
  "_inCache": true,
  "_installable": true,
  "_location": "/brace-expansion",
-  "_nodeVersion": "6.0.0",
+  "_nodeVersion": "4.4.5",
  "_npmOperationalInternal": {
-    "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/brace-expansion-1.1.4.tgz_1462130058897_0.14984136167913675"
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/brace-expansion-1.1.5.tgz_1465989660138_0.34528115345165133"
  },
  "_npmUser": {
-    "email": "julian@juliangruber.com",
-    "name": "juliangruber"
+    "name": "juliangruber",
+    "email": "julian@juliangruber.com"
  },
-  "_npmVersion": "3.8.6",
+  "_npmVersion": "2.15.5",
  "_phantomChildren": {},
  "_requested": {
-    "name": "brace-expansion",
    "raw": "brace-expansion@^1.0.0",
-    "rawSpec": "^1.0.0",
    "scope": null,
+    "escapedName": "brace-expansion",
+    "name": "brace-expansion",
+    "rawSpec": "^1.0.0",
    "spec": ">=1.0.0 <2.0.0",
    "type": "range"
  },
  "_requiredBy": [
    "/minimatch"
  ],
-  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz",
-  "_shasum": "464a204c77f482c085c2a36c456bbfbafb67a127",
+  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz",
+  "_shasum": "f5b4ad574e2cb7ccc1eb83e6fe79b8ecadf7a526",
  "_shrinkwrap": null,
  "_spec": "brace-expansion@^1.0.0",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\minimatch",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\minimatch",
  "author": {
-    "email": "mail@juliangruber.com",
    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
    "url": "http://juliangruber.com"
  },
  "bugs": {
@@ -55,22 +64,22 @@
  },
  "directories": {},
  "dist": {
-    "shasum": "464a204c77f482c085c2a36c456bbfbafb67a127",
-    "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz"
+    "shasum": "f5b4ad574e2cb7ccc1eb83e6fe79b8ecadf7a526",
+    "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz"
  },
-  "gitHead": "1660b75d0bf03b022e7888b576cd5a4080692c1d",
+  "gitHead": "ff31acab078f1bb696ac4c55ca56ea24e6495fb6",
  "homepage": "https://github.com/juliangruber/brace-expansion",
  "keywords": [],
  "license": "MIT",
  "main": "index.js",
  "maintainers": [
    {
-      "email": "julian@juliangruber.com",
-      "name": "juliangruber"
+      "name": "juliangruber",
+      "email": "julian@juliangruber.com"
    },
    {
-      "email": "isaacs@npmjs.com",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
    }
  ],
  "name": "brace-expansion",
@@ -85,6 +94,7 @@
    "test": "tape test/*.js"
  },
  "testling": {
+    "files": "test/*.js",
    "browsers": [
      "ie/8..latest",
      "firefox/20..latest",
@@ -97,8 +107,7 @@
      "ipad/6.0..latest",
      "iphone/6.0..latest",
      "android-browser/4.2..latest"
-    ],
-    "files": "test/*.js"
+    ]
  },
-  "version": "1.1.4"
+  "version": "1.1.5"
 }
--- a/node_modules/concat-map/package.json
+++ b/node_modules/concat-map/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "concat-map@0.0.1",
-      "D:\\Cordova\\cordova-android\\node_modules\\brace-expansion"
+      {
+        "raw": "concat-map@0.0.1",
+        "scope": null,
+        "escapedName": "concat-map",
+        "name": "concat-map",
+        "rawSpec": "0.0.1",
+        "spec": "0.0.1",
+        "type": "version"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\brace-expansion"
    ]
  ],
  "_from": "concat-map@0.0.1",
@@ -11,16 +19,17 @@
  "_installable": true,
  "_location": "/concat-map",
  "_npmUser": {
-    "email": "mail@substack.net",
-    "name": "substack"
+    "name": "substack",
+    "email": "mail@substack.net"
  },
  "_npmVersion": "1.3.21",
  "_phantomChildren": {},
  "_requested": {
-    "name": "concat-map",
    "raw": "concat-map@0.0.1",
-    "rawSpec": "0.0.1",
    "scope": null,
+    "escapedName": "concat-map",
+    "name": "concat-map",
+    "rawSpec": "0.0.1",
    "spec": "0.0.1",
    "type": "version"
  },
@@ -31,10 +40,10 @@
  "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
  "_shrinkwrap": null,
  "_spec": "concat-map@0.0.1",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\brace-expansion",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\brace-expansion",
  "author": {
-    "email": "mail@substack.net",
    "name": "James Halliday",
+    "email": "mail@substack.net",
    "url": "http://substack.net"
  },
  "bugs": {
@@ -65,8 +74,8 @@
  "main": "index.js",
  "maintainers": [
    {
-      "email": "mail@substack.net",
-      "name": "substack"
+      "name": "substack",
+      "email": "mail@substack.net"
    }
  ],
  "name": "concat-map",
@@ -80,30 +89,30 @@
    "test": "tape test/*.js"
  },
  "testling": {
+    "files": "test/*.js",
    "browsers": {
-      "chrome": [
-        10,
-        22
-      ],
-      "ff": [
-        3.5,
-        10,
-        15
-      ],
      "ie": [
        6,
        7,
        8,
        9
      ],
-      "opera": [
-        12
+      "ff": [
+        3.5,
+        10,
+        15
+      ],
+      "chrome": [
+        10,
+        22
      ],
      "safari": [
        5.1
+      ],
+      "opera": [
+        12
      ]
-    },
-    "files": "test/*.js"
+    }
  },
  "version": "0.0.1"
 }
--- a/node_modules/cordova-common/package.json
+++ b/node_modules/cordova-common/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "cordova-common@^1.3.0",
-      "D:\\Cordova\\cordova-android"
+      {
+        "raw": "cordova-common@^1.3.0",
+        "scope": null,
+        "escapedName": "cordova-common",
+        "name": "cordova-common",
+        "rawSpec": "^1.3.0",
+        "spec": ">=1.3.0 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android"
    ]
  ],
  "_from": "cordova-common@>=1.3.0 <2.0.0",
@@ -16,16 +24,17 @@
    "tmp": "tmp/cordova-common-1.3.0.tgz_1464130094288_0.48495062021538615"
  },
  "_npmUser": {
-    "email": "stevengill97@gmail.com",
-    "name": "stevegill"
+    "name": "stevegill",
+    "email": "stevengill97@gmail.com"
  },
  "_npmVersion": "3.9.0",
  "_phantomChildren": {},
  "_requested": {
-    "name": "cordova-common",
    "raw": "cordova-common@^1.3.0",
-    "rawSpec": "^1.3.0",
    "scope": null,
+    "escapedName": "cordova-common",
+    "name": "cordova-common",
+    "rawSpec": "^1.3.0",
    "spec": ">=1.3.0 <2.0.0",
    "type": "range"
  },
@@ -36,13 +45,13 @@
  "_shasum": "f75161f6aa7cef5486fd5d69a3b0a1f628334491",
  "_shrinkwrap": null,
  "_spec": "cordova-common@^1.3.0",
-  "_where": "D:\\Cordova\\cordova-android",
+  "_where": "d:\\cordova\\cordova-android",
  "author": {
    "name": "Apache Software Foundation"
  },
  "bugs": {
-    "email": "dev@cordova.apache.org",
-    "url": "https://issues.apache.org/jira/browse/CB"
+    "url": "https://issues.apache.org/jira/browse/CB",
+    "email": "dev@cordova.apache.org"
  },
  "contributors": [],
  "dependencies": {
@@ -81,28 +90,28 @@
  "main": "cordova-common.js",
  "maintainers": [
    {
-      "email": "bowserj@apache.org",
-      "name": "bowserj"
+      "name": "bowserj",
+      "email": "bowserj@apache.org"
    },
    {
-      "email": "kotikov.vladimir@gmail.com",
-      "name": "kotikov.vladimir"
+      "name": "kotikov.vladimir",
+      "email": "kotikov.vladimir@gmail.com"
    },
    {
-      "email": "purplecabbage@gmail.com",
-      "name": "purplecabbage"
+      "name": "purplecabbage",
+      "email": "purplecabbage@gmail.com"
    },
    {
-      "email": "shazron@gmail.com",
-      "name": "shazron"
+      "name": "shazron",
+      "email": "shazron@gmail.com"
    },
    {
-      "email": "stevengill97@gmail.com",
-      "name": "stevegill"
+      "name": "stevegill",
+      "email": "stevengill97@gmail.com"
    },
    {
-      "email": "npmjs@barhams.info",
-      "name": "timbarham"
+      "name": "timbarham",
+      "email": "npmjs@barhams.info"
    }
  ],
  "name": "cordova-common",
--- a/node_modules/cordova-registry-mapper/package.json
+++ b/node_modules/cordova-registry-mapper/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "cordova-registry-mapper@^1.1.8",
-      "D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
+      {
+        "raw": "cordova-registry-mapper@^1.1.8",
+        "scope": null,
+        "escapedName": "cordova-registry-mapper",
+        "name": "cordova-registry-mapper",
+        "rawSpec": "^1.1.8",
+        "spec": ">=1.1.8 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "cordova-registry-mapper@>=1.1.8 <2.0.0",
@@ -12,16 +20,17 @@
  "_location": "/cordova-registry-mapper",
  "_nodeVersion": "5.4.1",
  "_npmUser": {
-    "email": "stevengill97@gmail.com",
-    "name": "stevegill"
+    "name": "stevegill",
+    "email": "stevengill97@gmail.com"
  },
  "_npmVersion": "3.5.3",
  "_phantomChildren": {},
  "_requested": {
-    "name": "cordova-registry-mapper",
    "raw": "cordova-registry-mapper@^1.1.8",
-    "rawSpec": "^1.1.8",
    "scope": null,
+    "escapedName": "cordova-registry-mapper",
+    "name": "cordova-registry-mapper",
+    "rawSpec": "^1.1.8",
    "spec": ">=1.1.8 <2.0.0",
    "type": "range"
  },
@@ -32,7 +41,7 @@
  "_shasum": "e244b9185b8175473bff6079324905115f83dc7c",
  "_shrinkwrap": null,
  "_spec": "cordova-registry-mapper@^1.1.8",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
    "name": "Steve Gill"
  },
@@ -47,7 +56,7 @@
  "directories": {},
  "dist": {
    "shasum": "e244b9185b8175473bff6079324905115f83dc7c",
-    "tarball": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz"
+    "tarball": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz"
  },
  "gitHead": "00af0f028ec94154a364eeabe38b8e22320647bd",
  "homepage": "https://github.com/stevengill/cordova-registry-mapper#readme",
@@ -59,8 +68,8 @@
  "main": "index.js",
  "maintainers": [
    {
-      "email": "stevengill97@gmail.com",
-      "name": "stevegill"
+      "name": "stevegill",
+      "email": "stevengill97@gmail.com"
    }
  ],
  "name": "cordova-registry-mapper",
--- a/node_modules/elementtree/package.json
+++ b/node_modules/elementtree/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "elementtree@^0.1.6",
-      "D:\\Cordova\\cordova-android"
+      {
+        "raw": "elementtree@^0.1.6",
+        "scope": null,
+        "escapedName": "elementtree",
+        "name": "elementtree",
+        "rawSpec": "^0.1.6",
+        "spec": ">=0.1.6 <0.2.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android"
    ]
  ],
  "_from": "elementtree@>=0.1.6 <0.2.0",
@@ -11,16 +19,17 @@
  "_installable": true,
  "_location": "/elementtree",
  "_npmUser": {
-    "email": "ryan@trolocsis.com",
-    "name": "rphillips"
+    "name": "rphillips",
+    "email": "ryan@trolocsis.com"
  },
  "_npmVersion": "1.3.24",
  "_phantomChildren": {},
  "_requested": {
-    "name": "elementtree",
    "raw": "elementtree@^0.1.6",
-    "rawSpec": "^0.1.6",
    "scope": null,
+    "escapedName": "elementtree",
+    "name": "elementtree",
+    "rawSpec": "^0.1.6",
    "spec": ">=0.1.6 <0.2.0",
    "type": "range"
  },
@@ -32,7 +41,7 @@
  "_shasum": "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c",
  "_shrinkwrap": null,
  "_spec": "elementtree@^0.1.6",
-  "_where": "D:\\Cordova\\cordova-android",
+  "_where": "d:\\cordova\\cordova-android",
  "author": {
    "name": "Rackspace US, Inc."
  },
@@ -41,12 +50,12 @@
  },
  "contributors": [
    {
-      "email": "paul.querna@rackspace.com",
-      "name": "Paul Querna"
+      "name": "Paul Querna",
+      "email": "paul.querna@rackspace.com"
    },
    {
-      "email": "tomaz.muraus@rackspace.com",
-      "name": "Tomaz Muraus"
+      "name": "Tomaz Muraus",
+      "email": "tomaz.muraus@rackspace.com"
    }
  ],
  "dependencies": {
@@ -83,8 +92,8 @@
  "main": "lib/elementtree.js",
  "maintainers": [
    {
-      "email": "ryan@trolocsis.com",
-      "name": "rphillips"
+      "name": "rphillips",
+      "email": "ryan@trolocsis.com"
    }
  ],
  "name": "elementtree",
--- a/node_modules/glob/package.json
+++ b/node_modules/glob/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "glob@^5.0.13",
-      "D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
+      {
+        "raw": "glob@^5.0.13",
+        "scope": null,
+        "escapedName": "glob",
+        "name": "glob",
+        "rawSpec": "^5.0.13",
+        "spec": ">=5.0.13 <6.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "glob@>=5.0.13 <6.0.0",
@@ -12,16 +20,17 @@
  "_location": "/glob",
  "_nodeVersion": "4.0.0",
  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
  },
  "_npmVersion": "3.3.2",
  "_phantomChildren": {},
  "_requested": {
-    "name": "glob",
    "raw": "glob@^5.0.13",
-    "rawSpec": "^5.0.13",
    "scope": null,
+    "escapedName": "glob",
+    "name": "glob",
+    "rawSpec": "^5.0.13",
    "spec": ">=5.0.13 <6.0.0",
    "type": "range"
  },
@@ -32,10 +41,10 @@
  "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1",
  "_shrinkwrap": null,
  "_spec": "glob@^5.0.13",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
-    "email": "i@izs.me",
    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
    "url": "http://blog.izs.me/"
  },
  "bugs": {
@@ -74,8 +83,8 @@
  "main": "glob.js",
  "maintainers": [
    {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
    }
  ],
  "name": "glob",
--- a/node_modules/inflight/package.json
+++ b/node_modules/inflight/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "inflight@^1.0.4",
-      "D:\\Cordova\\cordova-android\\node_modules\\glob"
+      {
+        "raw": "inflight@^1.0.4",
+        "scope": null,
+        "escapedName": "inflight",
+        "name": "inflight",
+        "rawSpec": "^1.0.4",
+        "spec": ">=1.0.4 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\glob"
    ]
  ],
  "_from": "inflight@>=1.0.4 <2.0.0",
@@ -16,16 +24,17 @@
    "tmp": "tmp/inflight-1.0.5.tgz_1463529611443_0.00041943578980863094"
  },
  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
  },
  "_npmVersion": "3.9.1",
  "_phantomChildren": {},
  "_requested": {
-    "name": "inflight",
    "raw": "inflight@^1.0.4",
-    "rawSpec": "^1.0.4",
    "scope": null,
+    "escapedName": "inflight",
+    "name": "inflight",
+    "rawSpec": "^1.0.4",
    "spec": ">=1.0.4 <2.0.0",
    "type": "range"
  },
@@ -36,10 +45,10 @@
  "_shasum": "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a",
  "_shrinkwrap": null,
  "_spec": "inflight@^1.0.4",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\glob",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\glob",
  "author": {
-    "email": "i@izs.me",
    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
    "url": "http://blog.izs.me/"
  },
  "bugs": {
@@ -67,20 +76,20 @@
  "main": "inflight.js",
  "maintainers": [
    {
-      "email": "me@re-becca.org",
-      "name": "iarna"
+      "name": "iarna",
+      "email": "me@re-becca.org"
    },
    {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
    },
    {
-      "email": "ogd@aoaioxxysz.net",
-      "name": "othiym23"
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
    },
    {
-      "email": "kat@sykosomatic.org",
-      "name": "zkat"
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
    }
  ],
  "name": "inflight",
--- a/node_modules/inherits/package.json
+++ b/node_modules/inherits/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "inherits@2",
-      "D:\\Cordova\\cordova-android\\node_modules\\glob"
+      {
+        "raw": "inherits@2",
+        "scope": null,
+        "escapedName": "inherits",
+        "name": "inherits",
+        "rawSpec": "2",
+        "spec": ">=2.0.0 <3.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\glob"
    ]
  ],
  "_from": "inherits@>=2.0.0 <3.0.0",
@@ -11,16 +19,17 @@
  "_installable": true,
  "_location": "/inherits",
  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
+    "name": "isaacs",
+    "email": "i@izs.me"
  },
  "_npmVersion": "1.3.8",
  "_phantomChildren": {},
  "_requested": {
-    "name": "inherits",
    "raw": "inherits@2",
-    "rawSpec": "2",
    "scope": null,
+    "escapedName": "inherits",
+    "name": "inherits",
+    "rawSpec": "2",
    "spec": ">=2.0.0 <3.0.0",
    "type": "range"
  },
@@ -31,7 +40,7 @@
  "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
  "_shrinkwrap": null,
  "_spec": "inherits@2",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\glob",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\glob",
  "browser": "./inherits_browser.js",
  "bugs": {
    "url": "https://github.com/isaacs/inherits/issues"
@@ -59,8 +68,8 @@
  "main": "./inherits.js",
  "maintainers": [
    {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
    }
  ],
  "name": "inherits",
--- a/node_modules/lodash/package.json
+++ b/node_modules/lodash/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "lodash@^3.5.0",
-      "D:\\Cordova\\cordova-android\\node_modules\\xmlbuilder"
+      {
+        "raw": "lodash@^3.5.0",
+        "scope": null,
+        "escapedName": "lodash",
+        "name": "lodash",
+        "rawSpec": "^3.5.0",
+        "spec": ">=3.5.0 <4.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\xmlbuilder"
    ]
  ],
  "_from": "lodash@>=3.5.0 <4.0.0",
@@ -12,16 +20,17 @@
  "_location": "/lodash",
  "_nodeVersion": "0.12.5",
  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
  },
  "_npmVersion": "2.13.1",
  "_phantomChildren": {},
  "_requested": {
-    "name": "lodash",
    "raw": "lodash@^3.5.0",
-    "rawSpec": "^3.5.0",
    "scope": null,
+    "escapedName": "lodash",
+    "name": "lodash",
+    "rawSpec": "^3.5.0",
    "spec": ">=3.5.0 <4.0.0",
    "type": "range"
  },
@@ -32,10 +41,10 @@
  "_shasum": "5bf45e8e49ba4189e17d482789dfd15bd140b7b6",
  "_shrinkwrap": null,
  "_spec": "lodash@^3.5.0",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\xmlbuilder",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\xmlbuilder",
  "author": {
-    "email": "john.david.dalton@gmail.com",
    "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
    "url": "http://allyoucanleet.com/"
  },
  "bugs": {
@@ -43,28 +52,28 @@
  },
  "contributors": [
    {
-      "email": "john.david.dalton@gmail.com",
      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
      "url": "http://allyoucanleet.com/"
    },
    {
-      "email": "demoneaux@gmail.com",
      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
      "url": "https://d10.github.io/"
    },
    {
-      "email": "blaine@iceddev.com",
      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
      "url": "http://www.iceddev.com/"
    },
    {
-      "email": "github@kitcambridge.be",
      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
      "url": "http://kitcambridge.be/"
    },
    {
-      "email": "mathias@qiwi.be",
      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
      "url": "https://mathiasbynens.be/"
    }
  ],
@@ -87,24 +96,24 @@
  "main": "index.js",
  "maintainers": [
    {
-      "email": "john.david.dalton@gmail.com",
-      "name": "jdalton"
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
    },
    {
-      "email": "mathias@qiwi.be",
-      "name": "mathias"
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
    },
    {
-      "email": "blaine@iceddev.com",
-      "name": "phated"
+      "name": "phated",
+      "email": "blaine@iceddev.com"
    },
    {
-      "email": "github@kitcambridge.be",
-      "name": "kitcambridge"
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
    },
    {
-      "email": "demoneaux@gmail.com",
-      "name": "d10"
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
    }
  ],
  "name": "lodash",
--- a/node_modules/minimatch/README.md
+++ b/node_modules/minimatch/README.md
@@ -2,7 +2,7 @@

 A minimal matching utility.

-[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch)
+[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.svg)](http://travis-ci.org/isaacs/minimatch)


 This is the matching library used internally by npm.
@@ -37,7 +37,7 @@ See:

 ## Minimatch Class

-Create a minimatch object by instanting the `minimatch.Minimatch` class.
+Create a minimatch object by instantiating the `minimatch.Minimatch` class.

 ```javascript
 var Minimatch = require("minimatch").Minimatch
@@ -82,13 +82,6 @@ var mm = new Minimatch(pattern, options)

 All other methods are internal, and will be called as necessary.

-## Functions
-
-The top-level exported function has a `cache` property, which is an LRU
-cache set to store 100 items.  So, calling these methods repeatedly
-with the same pattern and options will use the same Minimatch object,
-saving the cost of parsing it multiple times.
-
 ### minimatch(path, pattern, options)

 Main export.  Tests a path against the pattern using the options.
--- a/node_modules/minimatch/minimatch.js
+++ b/node_modules/minimatch/minimatch.js
@@ -235,7 +235,7 @@ function braceExpand (pattern, options) {
    ? this.pattern : pattern

  if (typeof pattern === 'undefined') {
-    throw new Error('undefined pattern')
+    throw new TypeError('undefined pattern')
  }

  if (options.nobrace ||
@@ -261,6 +261,10 @@ function braceExpand (pattern, options) {
 Minimatch.prototype.parse = parse
 var SUBPARSE = {}
 function parse (pattern, isSub) {
+  if (pattern.length > 1024 * 64) {
+    throw new TypeError('pattern is too long')
+  }
+
  var options = this.options

  // shortcuts
@@ -518,7 +522,7 @@ function parse (pattern, isSub) {
  for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
    var tail = re.slice(pl.reStart + 3)
    // maybe some even number of \, then maybe 1 \, followed by a |
-    tail = tail.replace(/((?:\\{2})*)(\\?)\|/g, function (_, $1, $2) {
+    tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
      if (!$2) {
        // the | isn't already escaped, so escape it.
        $2 = '\\'
@@ -615,7 +619,15 @@ function parse (pattern, isSub) {
  }

  var flags = options.nocase ? 'i' : ''
-  var regExp = new RegExp('^' + re + '$', flags)
+  try {
+    var regExp = new RegExp('^' + re + '$', flags)
+  } catch (er) {
+    // If it was an invalid regular expression, then it can't match
+    // anything.  This trick looks for a character after the end of
+    // the string, which is of course impossible, except in multi-line
+    // mode, but it's not a /m regex.
+    return new RegExp('$.')
+  }

  regExp._glob = pattern
  regExp._src = re
--- a/node_modules/minimatch/package.json
+++ b/node_modules/minimatch/package.json
@@ -1,27 +1,40 @@
 {
  "_args": [
    [
-      "minimatch@^3.0.0",
-      "D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
+      {
+        "raw": "minimatch@^3.0.0",
+        "scope": null,
+        "escapedName": "minimatch",
+        "name": "minimatch",
+        "rawSpec": "^3.0.0",
+        "spec": ">=3.0.0 <4.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "minimatch@>=3.0.0 <4.0.0",
-  "_id": "minimatch@3.0.0",
+  "_id": "minimatch@3.0.2",
  "_inCache": true,
  "_installable": true,
  "_location": "/minimatch",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
+  "_nodeVersion": "4.4.4",
+  "_npmOperationalInternal": {
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/minimatch-3.0.2.tgz_1466194379770_0.11417287751100957"
  },
-  "_npmVersion": "3.3.2",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
+  "_npmVersion": "3.9.1",
  "_phantomChildren": {},
  "_requested": {
-    "name": "minimatch",
    "raw": "minimatch@^3.0.0",
-    "rawSpec": "^3.0.0",
    "scope": null,
+    "escapedName": "minimatch",
+    "name": "minimatch",
+    "rawSpec": "^3.0.0",
    "spec": ">=3.0.0 <4.0.0",
    "type": "range"
  },
@@ -29,14 +42,14 @@
    "/cordova-common",
    "/glob"
  ],
-  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-  "_shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83",
+  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz",
+  "_shasum": "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a",
  "_shrinkwrap": null,
  "_spec": "minimatch@^3.0.0",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
-    "email": "i@izs.me",
    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
    "url": "http://blog.izs.me"
  },
  "bugs": {
@@ -48,12 +61,12 @@
  "description": "a glob matcher in javascript",
  "devDependencies": {
    "standard": "^3.7.2",
-    "tap": "^1.2.0"
+    "tap": "^5.6.0"
  },
  "directories": {},
  "dist": {
-    "shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83",
-    "tarball": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
+    "shasum": "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a",
+    "tarball": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"
  },
  "engines": {
    "node": "*"
@@ -61,14 +74,14 @@
  "files": [
    "minimatch.js"
  ],
-  "gitHead": "270dbea567f0af6918cb18103e98c612aa717a20",
+  "gitHead": "81edb7c763abd31ba981c87ec5e835f178786be0",
  "homepage": "https://github.com/isaacs/minimatch#readme",
  "license": "ISC",
  "main": "minimatch.js",
  "maintainers": [
    {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
    }
  ],
  "name": "minimatch",
@@ -82,5 +95,5 @@
    "posttest": "standard minimatch.js test/*.js",
    "test": "tap test/*.js"
  },
-  "version": "3.0.0"
+  "version": "3.0.2"
 }
--- a/node_modules/nopt/package.json
+++ b/node_modules/nopt/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "nopt@^3.0.1",
-      "D:\\Cordova\\cordova-android"
+      {
+        "raw": "nopt@^3.0.1",
+        "scope": null,
+        "escapedName": "nopt",
+        "name": "nopt",
+        "rawSpec": "^3.0.1",
+        "spec": ">=3.0.1 <4.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android"
    ]
  ],
  "_from": "nopt@>=3.0.1 <4.0.0",
@@ -12,16 +20,17 @@
  "_location": "/nopt",
  "_nodeVersion": "4.2.1",
  "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
+    "name": "othiym23",
+    "email": "ogd@aoaioxxysz.net"
  },
  "_npmVersion": "2.14.10",
  "_phantomChildren": {},
  "_requested": {
-    "name": "nopt",
    "raw": "nopt@^3.0.1",
-    "rawSpec": "^3.0.1",
    "scope": null,
+    "escapedName": "nopt",
+    "name": "nopt",
+    "rawSpec": "^3.0.1",
    "spec": ">=3.0.1 <4.0.0",
    "type": "range"
  },
@@ -32,10 +41,10 @@
  "_shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9",
  "_shrinkwrap": null,
  "_spec": "nopt@^3.0.1",
-  "_where": "D:\\Cordova\\cordova-android",
+  "_where": "d:\\cordova\\cordova-android",
  "author": {
-    "email": "i@izs.me",
    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
    "url": "http://blog.izs.me/"
  },
  "bin": {
@@ -62,16 +71,16 @@
  "main": "lib/nopt.js",
  "maintainers": [
    {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
    },
    {
-      "email": "ogd@aoaioxxysz.net",
-      "name": "othiym23"
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
    },
    {
-      "email": "kat@sykosomatic.org",
-      "name": "zkat"
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
    }
  ],
  "name": "nopt",
--- a/node_modules/once/package.json
+++ b/node_modules/once/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "once@^1.3.0",
-      "D:\\Cordova\\cordova-android\\node_modules\\glob"
+      {
+        "raw": "once@^1.3.0",
+        "scope": null,
+        "escapedName": "once",
+        "name": "once",
+        "rawSpec": "^1.3.0",
+        "spec": ">=1.3.0 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\glob"
    ]
  ],
  "_from": "once@>=1.3.0 <2.0.0",
@@ -12,16 +20,17 @@
  "_location": "/once",
  "_nodeVersion": "4.0.0",
  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
+    "name": "isaacs",
+    "email": "i@izs.me"
  },
  "_npmVersion": "3.3.2",
  "_phantomChildren": {},
  "_requested": {
-    "name": "once",
    "raw": "once@^1.3.0",
-    "rawSpec": "^1.3.0",
    "scope": null,
+    "escapedName": "once",
+    "name": "once",
+    "rawSpec": "^1.3.0",
    "spec": ">=1.3.0 <2.0.0",
    "type": "range"
  },
@@ -33,10 +42,10 @@
  "_shasum": "b2e261557ce4c314ec8304f3fa82663e4297ca20",
  "_shrinkwrap": null,
  "_spec": "once@^1.3.0",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\glob",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\glob",
  "author": {
-    "email": "i@izs.me",
    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
    "url": "http://blog.izs.me/"
  },
  "bugs": {
@@ -71,8 +80,8 @@
  "main": "once.js",
  "maintainers": [
    {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
    }
  ],
  "name": "once",
--- a/node_modules/os-homedir/package.json
+++ b/node_modules/os-homedir/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "os-homedir@^1.0.0",
-      "D:\\Cordova\\cordova-android\\node_modules\\osenv"
+      {
+        "raw": "os-homedir@^1.0.0",
+        "scope": null,
+        "escapedName": "os-homedir",
+        "name": "os-homedir",
+        "rawSpec": "^1.0.0",
+        "spec": ">=1.0.0 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\osenv"
    ]
  ],
  "_from": "os-homedir@>=1.0.0 <2.0.0",
@@ -12,16 +20,17 @@
  "_location": "/os-homedir",
  "_nodeVersion": "0.12.5",
  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
+    "name": "sindresorhus",
+    "email": "sindresorhus@gmail.com"
  },
  "_npmVersion": "2.11.2",
  "_phantomChildren": {},
  "_requested": {
-    "name": "os-homedir",
    "raw": "os-homedir@^1.0.0",
-    "rawSpec": "^1.0.0",
    "scope": null,
+    "escapedName": "os-homedir",
+    "name": "os-homedir",
+    "rawSpec": "^1.0.0",
    "spec": ">=1.0.0 <2.0.0",
    "type": "range"
  },
@@ -32,10 +41,10 @@
  "_shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007",
  "_shrinkwrap": null,
  "_spec": "os-homedir@^1.0.0",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\osenv",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\osenv",
  "author": {
-    "email": "sindresorhus@gmail.com",
    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
    "url": "sindresorhus.com"
  },
  "bugs": {
@@ -78,8 +87,8 @@
  "license": "MIT",
  "maintainers": [
    {
-      "email": "sindresorhus@gmail.com",
-      "name": "sindresorhus"
+      "name": "sindresorhus",
+      "email": "sindresorhus@gmail.com"
    }
  ],
  "name": "os-homedir",
--- a/node_modules/os-tmpdir/package.json
+++ b/node_modules/os-tmpdir/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "os-tmpdir@^1.0.0",
-      "D:\\Cordova\\cordova-android\\node_modules\\osenv"
+      {
+        "raw": "os-tmpdir@^1.0.0",
+        "scope": null,
+        "escapedName": "os-tmpdir",
+        "name": "os-tmpdir",
+        "rawSpec": "^1.0.0",
+        "spec": ">=1.0.0 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\osenv"
    ]
  ],
  "_from": "os-tmpdir@>=1.0.0 <2.0.0",
@@ -12,16 +20,17 @@
  "_location": "/os-tmpdir",
  "_nodeVersion": "0.12.3",
  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
+    "name": "sindresorhus",
+    "email": "sindresorhus@gmail.com"
  },
  "_npmVersion": "2.9.1",
  "_phantomChildren": {},
  "_requested": {
-    "name": "os-tmpdir",
    "raw": "os-tmpdir@^1.0.0",
-    "rawSpec": "^1.0.0",
    "scope": null,
+    "escapedName": "os-tmpdir",
+    "name": "os-tmpdir",
+    "rawSpec": "^1.0.0",
    "spec": ">=1.0.0 <2.0.0",
    "type": "range"
  },
@@ -32,10 +41,10 @@
  "_shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e",
  "_shrinkwrap": null,
  "_spec": "os-tmpdir@^1.0.0",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\osenv",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\osenv",
  "author": {
-    "email": "sindresorhus@gmail.com",
    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
    "url": "sindresorhus.com"
  },
  "bugs": {
@@ -78,8 +87,8 @@
  "license": "MIT",
  "maintainers": [
    {
-      "email": "sindresorhus@gmail.com",
-      "name": "sindresorhus"
+      "name": "sindresorhus",
+      "email": "sindresorhus@gmail.com"
    }
  ],
  "name": "os-tmpdir",
--- a/node_modules/osenv/package.json
+++ b/node_modules/osenv/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "osenv@^0.1.3",
-      "D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
+      {
+        "raw": "osenv@^0.1.3",
+        "scope": null,
+        "escapedName": "osenv",
+        "name": "osenv",
+        "rawSpec": "^0.1.3",
+        "spec": ">=0.1.3 <0.2.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "osenv@>=0.1.3 <0.2.0",
@@ -12,16 +20,17 @@
  "_location": "/osenv",
  "_nodeVersion": "2.2.1",
  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
  },
  "_npmVersion": "3.0.0",
  "_phantomChildren": {},
  "_requested": {
-    "name": "osenv",
    "raw": "osenv@^0.1.3",
-    "rawSpec": "^0.1.3",
    "scope": null,
+    "escapedName": "osenv",
+    "name": "osenv",
+    "rawSpec": "^0.1.3",
    "spec": ">=0.1.3 <0.2.0",
    "type": "range"
  },
@@ -32,10 +41,10 @@
  "_shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217",
  "_shrinkwrap": null,
  "_spec": "osenv@^0.1.3",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
-    "email": "i@izs.me",
    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
    "url": "http://blog.izs.me/"
  },
  "bugs": {
@@ -71,20 +80,20 @@
  "main": "osenv.js",
  "maintainers": [
    {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
    },
    {
-      "email": "rok@kowalski.gd",
-      "name": "robertkowalski"
+      "name": "robertkowalski",
+      "email": "rok@kowalski.gd"
    },
    {
-      "email": "ogd@aoaioxxysz.net",
-      "name": "othiym23"
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
    },
    {
-      "email": "me@re-becca.org",
-      "name": "iarna"
+      "name": "iarna",
+      "email": "me@re-becca.org"
    }
  ],
  "name": "osenv",
--- a/node_modules/path-is-absolute/package.json
+++ b/node_modules/path-is-absolute/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "path-is-absolute@^1.0.0",
-      "D:\\Cordova\\cordova-android\\node_modules\\glob"
+      {
+        "raw": "path-is-absolute@^1.0.0",
+        "scope": null,
+        "escapedName": "path-is-absolute",
+        "name": "path-is-absolute",
+        "rawSpec": "^1.0.0",
+        "spec": ">=1.0.0 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\glob"
    ]
  ],
  "_from": "path-is-absolute@>=1.0.0 <2.0.0",
@@ -12,16 +20,17 @@
  "_location": "/path-is-absolute",
  "_nodeVersion": "0.12.0",
  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
+    "name": "sindresorhus",
+    "email": "sindresorhus@gmail.com"
  },
  "_npmVersion": "2.5.1",
  "_phantomChildren": {},
  "_requested": {
-    "name": "path-is-absolute",
    "raw": "path-is-absolute@^1.0.0",
-    "rawSpec": "^1.0.0",
    "scope": null,
+    "escapedName": "path-is-absolute",
+    "name": "path-is-absolute",
+    "rawSpec": "^1.0.0",
    "spec": ">=1.0.0 <2.0.0",
    "type": "range"
  },
@@ -32,10 +41,10 @@
  "_shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912",
  "_shrinkwrap": null,
  "_spec": "path-is-absolute@^1.0.0",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\glob",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\glob",
  "author": {
-    "email": "sindresorhus@gmail.com",
    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
    "url": "sindresorhus.com"
  },
  "bugs": {
@@ -79,8 +88,8 @@
  "license": "MIT",
  "maintainers": [
    {
-      "email": "sindresorhus@gmail.com",
-      "name": "sindresorhus"
+      "name": "sindresorhus",
+      "email": "sindresorhus@gmail.com"
    }
  ],
  "name": "path-is-absolute",
--- a/node_modules/plist/package.json
+++ b/node_modules/plist/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "plist@^1.2.0",
-      "D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
+      {
+        "raw": "plist@^1.2.0",
+        "scope": null,
+        "escapedName": "plist",
+        "name": "plist",
+        "rawSpec": "^1.2.0",
+        "spec": ">=1.2.0 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "plist@>=1.2.0 <2.0.0",
@@ -12,16 +20,17 @@
  "_location": "/plist",
  "_nodeVersion": "5.0.0",
  "_npmUser": {
-    "email": "reinstein.mike@gmail.com",
-    "name": "mreinstein"
+    "name": "mreinstein",
+    "email": "reinstein.mike@gmail.com"
  },
  "_npmVersion": "3.3.11",
  "_phantomChildren": {},
  "_requested": {
-    "name": "plist",
    "raw": "plist@^1.2.0",
-    "rawSpec": "^1.2.0",
    "scope": null,
+    "escapedName": "plist",
+    "name": "plist",
+    "rawSpec": "^1.2.0",
    "spec": ">=1.2.0 <2.0.0",
    "type": "range"
  },
@@ -32,25 +41,25 @@
  "_shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593",
  "_shrinkwrap": null,
  "_spec": "plist@^1.2.0",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
-    "email": "nathan@tootallnate.net",
-    "name": "Nathan Rajlich"
+    "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net"
  },
  "bugs": {
    "url": "https://github.com/TooTallNate/node-plist/issues"
  },
  "contributors": [
    {
-      "email": "hans.huebner@gmail.com",
-      "name": "Hans Huebner"
+      "name": "Hans Huebner",
+      "email": "hans.huebner@gmail.com"
    },
    {
      "name": "Pierre Metrailler"
    },
    {
-      "email": "reinstein.mike@gmail.com",
-      "name": "Mike Reinstein"
+      "name": "Mike Reinstein",
+      "email": "reinstein.mike@gmail.com"
    },
    {
      "name": "Vladimir Tsvang"
@@ -91,16 +100,16 @@
  "main": "lib/plist.js",
  "maintainers": [
    {
-      "email": "nathan@tootallnate.net",
-      "name": "TooTallNate"
+      "name": "TooTallNate",
+      "email": "nathan@tootallnate.net"
    },
    {
-      "email": "nathan@tootallnate.net",
-      "name": "tootallnate"
+      "name": "tootallnate",
+      "email": "nathan@tootallnate.net"
    },
    {
-      "email": "reinstein.mike@gmail.com",
-      "name": "mreinstein"
+      "name": "mreinstein",
+      "email": "reinstein.mike@gmail.com"
    }
  ],
  "name": "plist",
--- a/node_modules/properties-parser/package.json
+++ b/node_modules/properties-parser/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "properties-parser@^0.2.3",
-      "D:\\Cordova\\cordova-android"
+      {
+        "raw": "properties-parser@^0.2.3",
+        "scope": null,
+        "escapedName": "properties-parser",
+        "name": "properties-parser",
+        "rawSpec": "^0.2.3",
+        "spec": ">=0.2.3 <0.3.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android"
    ]
  ],
  "_from": "properties-parser@>=0.2.3 <0.3.0",
@@ -11,16 +19,17 @@
  "_installable": true,
  "_location": "/properties-parser",
  "_npmUser": {
-    "email": "xavi.rmz@gmail.com",
-    "name": "xavi"
+    "name": "xavi",
+    "email": "xavi.rmz@gmail.com"
  },
  "_npmVersion": "1.3.23",
  "_phantomChildren": {},
  "_requested": {
-    "name": "properties-parser",
    "raw": "properties-parser@^0.2.3",
-    "rawSpec": "^0.2.3",
    "scope": null,
+    "escapedName": "properties-parser",
+    "name": "properties-parser",
+    "rawSpec": "^0.2.3",
    "spec": ">=0.2.3 <0.3.0",
    "type": "range"
  },
@@ -31,7 +40,7 @@
  "_shasum": "f7591255f707abbff227c7b56b637dbb0373a10f",
  "_shrinkwrap": null,
  "_spec": "properties-parser@^0.2.3",
-  "_where": "D:\\Cordova\\cordova-android",
+  "_where": "d:\\cordova\\cordova-android",
  "bugs": {
    "url": "https://github.com/xavi-/node-properties-parser/issues"
  },
@@ -41,7 +50,7 @@
  "directories": {},
  "dist": {
    "shasum": "f7591255f707abbff227c7b56b637dbb0373a10f",
-    "tarball": "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"
+    "tarball": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"
  },
  "engines": {
    "node": ">= 0.3.1"
@@ -58,8 +67,8 @@
  "main": "./index.js",
  "maintainers": [
    {
-      "email": "xavi.rmz@gmail.com",
-      "name": "xavi"
+      "name": "xavi",
+      "email": "xavi.rmz@gmail.com"
    }
  ],
  "name": "properties-parser",
--- a/node_modules/q/package.json
+++ b/node_modules/q/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "q@^1.4.1",
-      "D:\\Cordova\\cordova-android"
+      {
+        "raw": "q@^1.4.1",
+        "scope": null,
+        "escapedName": "q",
+        "name": "q",
+        "rawSpec": "^1.4.1",
+        "spec": ">=1.4.1 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android"
    ]
  ],
  "_from": "q@>=1.4.1 <2.0.0",
@@ -12,16 +20,17 @@
  "_location": "/q",
  "_nodeVersion": "1.8.1",
  "_npmUser": {
-    "email": "kris.kowal@cixar.com",
-    "name": "kriskowal"
+    "name": "kriskowal",
+    "email": "kris.kowal@cixar.com"
  },
  "_npmVersion": "2.8.3",
  "_phantomChildren": {},
  "_requested": {
-    "name": "q",
    "raw": "q@^1.4.1",
-    "rawSpec": "^1.4.1",
    "scope": null,
+    "escapedName": "q",
+    "name": "q",
+    "rawSpec": "^1.4.1",
    "spec": ">=1.4.1 <2.0.0",
    "type": "range"
  },
@@ -33,10 +42,10 @@
  "_shasum": "55705bcd93c5f3673530c2c2cbc0c2b3addc286e",
  "_shrinkwrap": null,
  "_spec": "q@^1.4.1",
-  "_where": "D:\\Cordova\\cordova-android",
+  "_where": "d:\\cordova\\cordova-android",
  "author": {
-    "email": "kris@cixar.com",
    "name": "Kris Kowal",
+    "email": "kris@cixar.com",
    "url": "https://github.com/kriskowal"
  },
  "bugs": {
@@ -44,18 +53,18 @@
  },
  "contributors": [
    {
-      "email": "kris@cixar.com",
      "name": "Kris Kowal",
+      "email": "kris@cixar.com",
      "url": "https://github.com/kriskowal"
    },
    {
-      "email": "rfobic@gmail.com",
      "name": "Irakli Gozalishvili",
+      "email": "rfobic@gmail.com",
      "url": "http://jeditoolkit.com"
    },
    {
-      "email": "domenic@domenicdenicola.com",
      "name": "Domenic Denicola",
+      "email": "domenic@domenicdenicola.com",
      "url": "http://domenicdenicola.com"
    }
  ],
@@ -111,12 +120,12 @@
  "main": "q.js",
  "maintainers": [
    {
-      "email": "kris.kowal@cixar.com",
-      "name": "kriskowal"
+      "name": "kriskowal",
+      "email": "kris.kowal@cixar.com"
    },
    {
-      "email": "domenic@domenicdenicola.com",
-      "name": "domenic"
+      "name": "domenic",
+      "email": "domenic@domenicdenicola.com"
    }
  ],
  "name": "q",
--- a/node_modules/sax/package.json
+++ b/node_modules/sax/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "sax@0.3.5",
-      "D:\\Cordova\\cordova-android\\node_modules\\elementtree"
+      {
+        "raw": "sax@0.3.5",
+        "scope": null,
+        "escapedName": "sax",
+        "name": "sax",
+        "rawSpec": "0.3.5",
+        "spec": "0.3.5",
+        "type": "version"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\elementtree"
    ]
  ],
  "_defaultsLoaded": true,
@@ -14,16 +22,17 @@
  "_location": "/sax",
  "_nodeVersion": "v0.6.7-pre",
  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
+    "name": "isaacs",
+    "email": "i@izs.me"
  },
  "_npmVersion": "1.1.0-beta-7",
  "_phantomChildren": {},
  "_requested": {
-    "name": "sax",
    "raw": "sax@0.3.5",
-    "rawSpec": "0.3.5",
    "scope": null,
+    "escapedName": "sax",
+    "name": "sax",
+    "rawSpec": "0.3.5",
    "spec": "0.3.5",
    "type": "version"
  },
@@ -34,10 +43,10 @@
  "_shasum": "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d",
  "_shrinkwrap": null,
  "_spec": "sax@0.3.5",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\elementtree",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\elementtree",
  "author": {
-    "email": "i@izs.me",
    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
    "url": "http://blog.izs.me/"
  },
  "bugs": {
@@ -45,36 +54,36 @@
  },
  "contributors": [
    {
-      "email": "i@izs.me",
-      "name": "Isaac Z. Schlueter"
+      "name": "Isaac Z. Schlueter",
+      "email": "i@izs.me"
    },
    {
-      "email": "stein@hustad.com",
-      "name": "Stein Martin Hustad"
+      "name": "Stein Martin Hustad",
+      "email": "stein@hustad.com"
    },
    {
-      "email": "mikeal.rogers@gmail.com",
-      "name": "Mikeal Rogers"
+      "name": "Mikeal Rogers",
+      "email": "mikeal.rogers@gmail.com"
    },
    {
-      "email": "laurie@holoweb.net",
-      "name": "Laurie Harper"
+      "name": "Laurie Harper",
+      "email": "laurie@holoweb.net"
    },
    {
-      "email": "jann@Jann-PC.fritz.box",
-      "name": "Jann Horn"
+      "name": "Jann Horn",
+      "email": "jann@Jann-PC.fritz.box"
    },
    {
-      "email": "tmpvar@gmail.com",
-      "name": "Elijah Insua"
+      "name": "Elijah Insua",
+      "email": "tmpvar@gmail.com"
    },
    {
-      "email": "henryr@schakra.com",
-      "name": "Henry Rawas"
+      "name": "Henry Rawas",
+      "email": "henryr@schakra.com"
    },
    {
-      "email": "jmpublic@makeig.com",
-      "name": "Justin Makeig"
+      "name": "Justin Makeig",
+      "email": "jmpublic@makeig.com"
    }
  ],
  "dependencies": {},
@@ -96,8 +105,8 @@
  "main": "lib/sax.js",
  "maintainers": [
    {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
    }
  ],
  "name": "sax",
--- a/node_modules/semver/.npmignore
+++ b/node_modules/semver/.npmignore
@@ -1,4 +0,0 @@
-node_modules/
-coverage/
-.nyc_output/
-nyc_output/
--- a/node_modules/semver/.travis.yml
+++ b/node_modules/semver/.travis.yml
@@ -1,5 +0,0 @@
-language: node_js
-node_js:
-  - '0.10'
-  - '0.12'
-  - 'iojs'
--- a/node_modules/semver/README.md
+++ b/node_modules/semver/README.md
@@ -16,18 +16,35 @@ As a command-line utility:

    $ semver -h

-    Usage: semver <version> [<version> [...]] [-r <range> | -i <inc> | --preid <identifier> | -l | -rv]
-    Test if version(s) satisfy the supplied range(s), and sort them.
+    SemVer 5.1.0

-    Multiple versions or ranges may be supplied, unless increment
-    option is specified.  In that case, only a single version may
-    be used, and it is incremented by the specified level
+    A JavaScript implementation of the http://semver.org/ specification
+    Copyright Isaac Z. Schlueter
+
+    Usage: semver [options] <version> [<version> [...]]
+    Prints valid versions sorted by SemVer precedence
+
+    Options:
+    -r --range <range>
+            Print versions that match the specified range.
+
+    -i --increment [<level>]
+            Increment a version by the specified level.  Level can
+            be one of: major, minor, patch, premajor, preminor,
+            prepatch, or prerelease.  Default level is 'patch'.
+            Only one version may be specified.
+
+    --preid <identifier>
+            Identifier to be used to prefix premajor, preminor,
+            prepatch or prerelease version increments.
+
+    -l --loose
+            Interpret versions and ranges loosely

    Program exits successfully if any valid version satisfies
    all supplied ranges, and prints all satisfying versions.

-    If no versions are valid, or ranges are not satisfied,
-    then exits failure.
+    If no satisfying versions are found, then exits failure.

    Versions are printed in ascending order, so supplying
    multiple versions to the utility will just sort them.
@@ -242,7 +259,7 @@ simple     ::= primitive | partial | tilde | caret
 primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial
 partial    ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
 xr         ::= 'x' | 'X' | '*' | nr
-nr         ::= '0' | ['1'-'9']['0'-'9']+
+nr         ::= '0' | ['1'-'9'] ( ['0'-'9'] ) *
 tilde      ::= '~' partial
 caret      ::= '^' partial
 qualifier  ::= ( '-' pre )? ( '+' build )?
@@ -272,6 +289,8 @@ strings that they parse.
    same as `prepatch`. It increments the patch version, then makes a
    prerelease. If the input version is already a prerelease it simply
    increments it.
+* `prerelease(v)`: Returns an array of prerelease components, or null
+  if none exist. Example: `prerelease('1.2.3-alpha.1') -> ['alpha', 1]`
 * `major(v)`: Return the major version number.
 * `minor(v)`: Return the minor version number.
 * `patch(v)`: Return the patch version number.
--- a/node_modules/semver/package.json
+++ b/node_modules/semver/package.json
@@ -1,38 +1,51 @@
 {
  "_args": [
    [
-      "semver@^5.0.1",
-      "D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
+      {
+        "raw": "semver@^5.0.1",
+        "scope": null,
+        "escapedName": "semver",
+        "name": "semver",
+        "rawSpec": "^5.0.1",
+        "spec": ">=5.0.1 <6.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "semver@>=5.0.1 <6.0.0",
-  "_id": "semver@5.1.0",
+  "_id": "semver@5.2.0",
  "_inCache": true,
  "_installable": true,
  "_location": "/semver",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
+  "_nodeVersion": "4.4.4",
+  "_npmOperationalInternal": {
+    "host": "packages-12-west.internal.npmjs.com",
+    "tmp": "tmp/semver-5.2.0.tgz_1467136841238_0.2250258030835539"
  },
-  "_npmVersion": "3.3.2",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
+  "_npmVersion": "3.10.2",
  "_phantomChildren": {},
  "_requested": {
-    "name": "semver",
    "raw": "semver@^5.0.1",
-    "rawSpec": "^5.0.1",
    "scope": null,
+    "escapedName": "semver",
+    "name": "semver",
+    "rawSpec": "^5.0.1",
    "spec": ">=5.0.1 <6.0.0",
    "type": "range"
  },
  "_requiredBy": [
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
-  "_shasum": "85f2cf8550465c4df000cf7d86f6b054106ab9e5",
+  "_resolved": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz",
+  "_shasum": "281995b80c1448209415ddbc4cf50c269cef55c5",
  "_shrinkwrap": null,
  "_spec": "semver@^5.0.1",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "bin": {
    "semver": "./bin/semver"
  },
@@ -46,21 +59,26 @@
  },
  "directories": {},
  "dist": {
-    "shasum": "85f2cf8550465c4df000cf7d86f6b054106ab9e5",
-    "tarball": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
+    "shasum": "281995b80c1448209415ddbc4cf50c269cef55c5",
+    "tarball": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz"
  },
-  "gitHead": "8e33a30e62e40e4983d1c5f55e794331b861aadc",
+  "files": [
+    "bin",
+    "range.bnf",
+    "semver.js"
+  ],
+  "gitHead": "f7fef36765c53ebe237bf415c3ea002f24aa5621",
  "homepage": "https://github.com/npm/node-semver#readme",
  "license": "ISC",
  "main": "semver.js",
  "maintainers": [
    {
-      "email": "isaacs@npmjs.com",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
    },
    {
-      "email": "ogd@aoaioxxysz.net",
-      "name": "othiym23"
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
    }
  ],
  "name": "semver",
@@ -73,5 +91,5 @@
  "scripts": {
    "test": "tap test/*.js"
  },
-  "version": "5.1.0"
+  "version": "5.2.0"
 }
--- a/node_modules/semver/range.bnf
+++ b/node_modules/semver/range.bnf
@@ -6,7 +6,7 @@ simple     ::= primitive | partial | tilde | caret
 primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial
 partial    ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
 xr         ::= 'x' | 'X' | '*' | nr
-nr         ::= '0' | ['1'-'9']['0'-'9']+
+nr         ::= '0' | ['1'-'9'] ( ['0'-'9'] ) *
 tilde      ::= '~' partial
 caret      ::= '^' partial
 qualifier  ::= ( '-' pre )? ( '+' build )?
--- a/node_modules/semver/semver.js
+++ b/node_modules/semver/semver.js
@@ -836,7 +836,7 @@ function replaceTilde(comp, loose) {
    else if (isX(m))
      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
    else if (isX(p))
-      // ~1.2 == >=1.2.0- <1.3.0-
+      // ~1.2 == >=1.2.0 <1.3.0
      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
    else if (pr) {
      debug('replaceTilde pr', pr);
@@ -1186,3 +1186,9 @@ function outside(version, range, hilo, loose) {
  }
  return true;
 }
+
+exports.prerelease = prerelease;
+function prerelease(version, loose) {
+  var parsed = parse(version, loose);
+  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null;
+}
--- a/node_modules/semver/test/big-numbers.js
+++ b/node_modules/semver/test/big-numbers.js
@@ -1,31 +0,0 @@
-var test = require('tap').test
-var semver = require('../')
-
-test('long version is too long', function (t) {
-  var v = '1.2.' + new Array(256).join('1')
-  t.throws(function () {
-    new semver.SemVer(v)
-  })
-  t.equal(semver.valid(v, false), null)
-  t.equal(semver.valid(v, true), null)
-  t.equal(semver.inc(v, 'patch'), null)
-  t.end()
-})
-
-test('big number is like too long version', function (t) {
-  var v = '1.2.' + new Array(100).join('1')
-  t.throws(function () {
-    new semver.SemVer(v)
-  })
-  t.equal(semver.valid(v, false), null)
-  t.equal(semver.valid(v, true), null)
-  t.equal(semver.inc(v, 'patch'), null)
-  t.end()
-})
-
-test('parsing null does not throw', function (t) {
-  t.equal(semver.parse(null), null)
-  t.equal(semver.parse({}), null)
-  t.equal(semver.parse(new semver.SemVer('1.2.3')).version, '1.2.3')
-  t.end()
-})
--- a/node_modules/semver/test/clean.js
+++ b/node_modules/semver/test/clean.js
@@ -1,29 +0,0 @@
-var tap = require('tap');
-var test = tap.test;
-var semver = require('../semver.js');
-var clean = semver.clean;
-
-test('\nclean tests', function(t) {
-	// [range, version]
-	// Version should be detectable despite extra characters
-	[
-		['1.2.3', '1.2.3'],
-		[' 1.2.3 ', '1.2.3'],
-		[' 1.2.3-4 ', '1.2.3-4'],
-		[' 1.2.3-pre ', '1.2.3-pre'],
-		['  =v1.2.3   ', '1.2.3'],
-		['v1.2.3', '1.2.3'],
-		[' v1.2.3 ', '1.2.3'],
-		['\t1.2.3', '1.2.3'],
-		['>1.2.3', null],
-		['~1.2.3', null],
-		['<=1.2.3', null],
-		['1.2.x', null]
-	].forEach(function(tuple) {
-			var range = tuple[0];
-			var version = tuple[1];
-			var msg = 'clean(' + range + ') = ' + version;
-			t.equal(clean(range), version, msg);
-		});
-	t.end();
-});
--- a/node_modules/semver/test/gtr.js
+++ b/node_modules/semver/test/gtr.js
@@ -1,173 +0,0 @@
-var tap = require('tap');
-var test = tap.test;
-var semver = require('../semver.js');
-var gtr = semver.gtr;
-
-test('\ngtr tests', function(t) {
-  // [range, version, loose]
-  // Version should be greater than range
-  [
-    ['~1.2.2', '1.3.0'],
-    ['~0.6.1-1', '0.7.1-1'],
-    ['1.0.0 - 2.0.0', '2.0.1'],
-    ['1.0.0', '1.0.1-beta1'],
-    ['1.0.0', '2.0.0'],
-    ['<=2.0.0', '2.1.1'],
-    ['<=2.0.0', '3.2.9'],
-    ['<2.0.0', '2.0.0'],
-    ['0.1.20 || 1.2.4', '1.2.5'],
-    ['2.x.x', '3.0.0'],
-    ['1.2.x', '1.3.0'],
-    ['1.2.x || 2.x', '3.0.0'],
-    ['2.*.*', '5.0.1'],
-    ['1.2.*', '1.3.3'],
-    ['1.2.* || 2.*', '4.0.0'],
-    ['2', '3.0.0'],
-    ['2.3', '2.4.2'],
-    ['~2.4', '2.5.0'], // >=2.4.0 <2.5.0
-    ['~2.4', '2.5.5'],
-    ['~>3.2.1', '3.3.0'], // >=3.2.1 <3.3.0
-    ['~1', '2.2.3'], // >=1.0.0 <2.0.0
-    ['~>1', '2.2.4'],
-    ['~> 1', '3.2.3'],
-    ['~1.0', '1.1.2'], // >=1.0.0 <1.1.0
-    ['~ 1.0', '1.1.0'],
-    ['<1.2', '1.2.0'],
-    ['< 1.2', '1.2.1'],
-    ['1', '2.0.0beta', true],
-    ['~v0.5.4-pre', '0.6.0'],
-    ['~v0.5.4-pre', '0.6.1-pre'],
-    ['=0.7.x', '0.8.0'],
-    ['=0.7.x', '0.8.0-asdf'],
-    ['<0.7.x', '0.7.0'],
-    ['~1.2.2', '1.3.0'],
-    ['1.0.0 - 2.0.0', '2.2.3'],
-    ['1.0.0', '1.0.1'],
-    ['<=2.0.0', '3.0.0'],
-    ['<=2.0.0', '2.9999.9999'],
-    ['<=2.0.0', '2.2.9'],
-    ['<2.0.0', '2.9999.9999'],
-    ['<2.0.0', '2.2.9'],
-    ['2.x.x', '3.1.3'],
-    ['1.2.x', '1.3.3'],
-    ['1.2.x || 2.x', '3.1.3'],
-    ['2.*.*', '3.1.3'],
-    ['1.2.*', '1.3.3'],
-    ['1.2.* || 2.*', '3.1.3'],
-    ['2', '3.1.2'],
-    ['2.3', '2.4.1'],
-    ['~2.4', '2.5.0'], // >=2.4.0 <2.5.0
-    ['~>3.2.1', '3.3.2'], // >=3.2.1 <3.3.0
-    ['~1', '2.2.3'], // >=1.0.0 <2.0.0
-    ['~>1', '2.2.3'],
-    ['~1.0', '1.1.0'], // >=1.0.0 <1.1.0
-    ['<1', '1.0.0'],
-    ['1', '2.0.0beta', true],
-    ['<1', '1.0.0beta', true],
-    ['< 1', '1.0.0beta', true],
-    ['=0.7.x', '0.8.2'],
-    ['<0.7.x', '0.7.2']
-  ].forEach(function(tuple) {
-    var range = tuple[0];
-    var version = tuple[1];
-    var loose = tuple[2] || false;
-    var msg = 'gtr(' + version + ', ' + range + ', ' + loose + ')';
-    t.ok(gtr(version, range, loose), msg);
-  });
-  t.end();
-});
-
-test('\nnegative gtr tests', function(t) {
-  // [range, version, loose]
-  // Version should NOT be greater than range
-  [
-    ['~0.6.1-1', '0.6.1-1'],
-    ['1.0.0 - 2.0.0', '1.2.3'],
-    ['1.0.0 - 2.0.0', '0.9.9'],
-    ['1.0.0', '1.0.0'],
-    ['>=*', '0.2.4'],
-    ['', '1.0.0', true],
-    ['*', '1.2.3'],
-    ['*', 'v1.2.3-foo'],
-    ['>=1.0.0', '1.0.0'],
-    ['>=1.0.0', '1.0.1'],
-    ['>=1.0.0', '1.1.0'],
-    ['>1.0.0', '1.0.1'],
-    ['>1.0.0', '1.1.0'],
-    ['<=2.0.0', '2.0.0'],
-    ['<=2.0.0', '1.9999.9999'],
-    ['<=2.0.0', '0.2.9'],
-    ['<2.0.0', '1.9999.9999'],
-    ['<2.0.0', '0.2.9'],
-    ['>= 1.0.0', '1.0.0'],
-    ['>=  1.0.0', '1.0.1'],
-    ['>=   1.0.0', '1.1.0'],
-    ['> 1.0.0', '1.0.1'],
-    ['>  1.0.0', '1.1.0'],
-    ['<=   2.0.0', '2.0.0'],
-    ['<= 2.0.0', '1.9999.9999'],
-    ['<=  2.0.0', '0.2.9'],
-    ['<    2.0.0', '1.9999.9999'],
-    ['<\t2.0.0', '0.2.9'],
-    ['>=0.1.97', 'v0.1.97'],
-    ['>=0.1.97', '0.1.97'],
-    ['0.1.20 || 1.2.4', '1.2.4'],
-    ['0.1.20 || >1.2.4', '1.2.4'],
-    ['0.1.20 || 1.2.4', '1.2.3'],
-    ['0.1.20 || 1.2.4', '0.1.20'],
-    ['>=0.2.3 || <0.0.1', '0.0.0'],
-    ['>=0.2.3 || <0.0.1', '0.2.3'],
-    ['>=0.2.3 || <0.0.1', '0.2.4'],
-    ['||', '1.3.4'],
-    ['2.x.x', '2.1.3'],
-    ['1.2.x', '1.2.3'],
-    ['1.2.x || 2.x', '2.1.3'],
-    ['1.2.x || 2.x', '1.2.3'],
-    ['x', '1.2.3'],
-    ['2.*.*', '2.1.3'],
-    ['1.2.*', '1.2.3'],
-    ['1.2.* || 2.*', '2.1.3'],
-    ['1.2.* || 2.*', '1.2.3'],
-    ['1.2.* || 2.*', '1.2.3'],
-    ['*', '1.2.3'],
-    ['2', '2.1.2'],
-    ['2.3', '2.3.1'],
-    ['~2.4', '2.4.0'], // >=2.4.0 <2.5.0
-    ['~2.4', '2.4.5'],
-    ['~>3.2.1', '3.2.2'], // >=3.2.1 <3.3.0
-    ['~1', '1.2.3'], // >=1.0.0 <2.0.0
-    ['~>1', '1.2.3'],
-    ['~> 1', '1.2.3'],
-    ['~1.0', '1.0.2'], // >=1.0.0 <1.1.0
-    ['~ 1.0', '1.0.2'],
-    ['>=1', '1.0.0'],
-    ['>= 1', '1.0.0'],
-    ['<1.2', '1.1.1'],
-    ['< 1.2', '1.1.1'],
-    ['1', '1.0.0beta', true],
-    ['~v0.5.4-pre', '0.5.5'],
-    ['~v0.5.4-pre', '0.5.4'],
-    ['=0.7.x', '0.7.2'],
-    ['>=0.7.x', '0.7.2'],
-    ['=0.7.x', '0.7.0-asdf'],
-    ['>=0.7.x', '0.7.0-asdf'],
-    ['<=0.7.x', '0.6.2'],
-    ['>0.2.3 >0.2.4 <=0.2.5', '0.2.5'],
-    ['>=0.2.3 <=0.2.4', '0.2.4'],
-    ['1.0.0 - 2.0.0', '2.0.0'],
-    ['^1', '0.0.0-0'],
-    ['^3.0.0', '2.0.0'],
-    ['^1.0.0 || ~2.0.1', '2.0.0'],
-    ['^0.1.0 || ~3.0.1 || 5.0.0', '3.2.0'],
-    ['^0.1.0 || ~3.0.1 || 5.0.0', '1.0.0beta', true],
-    ['^0.1.0 || ~3.0.1 || 5.0.0', '5.0.0-0', true],
-    ['^0.1.0 || ~3.0.1 || >4 <=5.0.0', '3.5.0']
-  ].forEach(function(tuple) {
-    var range = tuple[0];
-    var version = tuple[1];
-    var loose = tuple[2] || false;
-    var msg = '!gtr(' + version + ', ' + range + ', ' + loose + ')';
-    t.notOk(gtr(version, range, loose), msg);
-  });
-  t.end();
-});
--- a/node_modules/semver/test/index.js
+++ b/node_modules/semver/test/index.js
@@ -1,698 +0,0 @@
-'use strict';
-
-var tap = require('tap');
-var test = tap.test;
-var semver = require('../semver.js');
-var eq = semver.eq;
-var gt = semver.gt;
-var lt = semver.lt;
-var neq = semver.neq;
-var cmp = semver.cmp;
-var gte = semver.gte;
-var lte = semver.lte;
-var satisfies = semver.satisfies;
-var validRange = semver.validRange;
-var inc = semver.inc;
-var diff = semver.diff;
-var replaceStars = semver.replaceStars;
-var toComparators = semver.toComparators;
-var SemVer = semver.SemVer;
-var Range = semver.Range;
-
-test('\ncomparison tests', function(t) {
-  // [version1, version2]
-  // version1 should be greater than version2
-  [['0.0.0', '0.0.0-foo'],
-    ['0.0.1', '0.0.0'],
-    ['1.0.0', '0.9.9'],
-    ['0.10.0', '0.9.0'],
-    ['0.99.0', '0.10.0'],
-    ['2.0.0', '1.2.3'],
-    ['v0.0.0', '0.0.0-foo', true],
-    ['v0.0.1', '0.0.0', true],
-    ['v1.0.0', '0.9.9', true],
-    ['v0.10.0', '0.9.0', true],
-    ['v0.99.0', '0.10.0', true],
-    ['v2.0.0', '1.2.3', true],
-    ['0.0.0', 'v0.0.0-foo', true],
-    ['0.0.1', 'v0.0.0', true],
-    ['1.0.0', 'v0.9.9', true],
-    ['0.10.0', 'v0.9.0', true],
-    ['0.99.0', 'v0.10.0', true],
-    ['2.0.0', 'v1.2.3', true],
-    ['1.2.3', '1.2.3-asdf'],
-    ['1.2.3', '1.2.3-4'],
-    ['1.2.3', '1.2.3-4-foo'],
-    ['1.2.3-5-foo', '1.2.3-5'],
-    ['1.2.3-5', '1.2.3-4'],
-    ['1.2.3-5-foo', '1.2.3-5-Foo'],
-    ['3.0.0', '2.7.2+asdf'],
-    ['1.2.3-a.10', '1.2.3-a.5'],
-    ['1.2.3-a.b', '1.2.3-a.5'],
-    ['1.2.3-a.b', '1.2.3-a'],
-    ['1.2.3-a.b.c.10.d.5', '1.2.3-a.b.c.5.d.100'],
-    ['1.2.3-r2', '1.2.3-r100'],
-    ['1.2.3-r100', '1.2.3-R2']
-  ].forEach(function(v) {
-    var v0 = v[0];
-    var v1 = v[1];
-    var loose = v[2];
-    t.ok(gt(v0, v1, loose), "gt('" + v0 + "', '" + v1 + "')");
-    t.ok(lt(v1, v0, loose), "lt('" + v1 + "', '" + v0 + "')");
-    t.ok(!gt(v1, v0, loose), "!gt('" + v1 + "', '" + v0 + "')");
-    t.ok(!lt(v0, v1, loose), "!lt('" + v0 + "', '" + v1 + "')");
-    t.ok(eq(v0, v0, loose), "eq('" + v0 + "', '" + v0 + "')");
-    t.ok(eq(v1, v1, loose), "eq('" + v1 + "', '" + v1 + "')");
-    t.ok(neq(v0, v1, loose), "neq('" + v0 + "', '" + v1 + "')");
-    t.ok(cmp(v1, '==', v1, loose), "cmp('" + v1 + "' == '" + v1 + "')");
-    t.ok(cmp(v0, '>=', v1, loose), "cmp('" + v0 + "' >= '" + v1 + "')");
-    t.ok(cmp(v1, '<=', v0, loose), "cmp('" + v1 + "' <= '" + v0 + "')");
-    t.ok(cmp(v0, '!=', v1, loose), "cmp('" + v0 + "' != '" + v1 + "')");
-  });
-  t.end();
-});
-
-test('\nequality tests', function(t) {
-  // [version1, version2]
-  // version1 should be equivalent to version2
-  [['1.2.3', 'v1.2.3', true],
-    ['1.2.3', '=1.2.3', true],
-    ['1.2.3', 'v 1.2.3', true],
-    ['1.2.3', '= 1.2.3', true],
-    ['1.2.3', ' v1.2.3', true],
-    ['1.2.3', ' =1.2.3', true],
-    ['1.2.3', ' v 1.2.3', true],
-    ['1.2.3', ' = 1.2.3', true],
-    ['1.2.3-0', 'v1.2.3-0', true],
-    ['1.2.3-0', '=1.2.3-0', true],
-    ['1.2.3-0', 'v 1.2.3-0', true],
-    ['1.2.3-0', '= 1.2.3-0', true],
-    ['1.2.3-0', ' v1.2.3-0', true],
-    ['1.2.3-0', ' =1.2.3-0', true],
-    ['1.2.3-0', ' v 1.2.3-0', true],
-    ['1.2.3-0', ' = 1.2.3-0', true],
-    ['1.2.3-1', 'v1.2.3-1', true],
-    ['1.2.3-1', '=1.2.3-1', true],
-    ['1.2.3-1', 'v 1.2.3-1', true],
-    ['1.2.3-1', '= 1.2.3-1', true],
-    ['1.2.3-1', ' v1.2.3-1', true],
-    ['1.2.3-1', ' =1.2.3-1', true],
-    ['1.2.3-1', ' v 1.2.3-1', true],
-    ['1.2.3-1', ' = 1.2.3-1', true],
-    ['1.2.3-beta', 'v1.2.3-beta', true],
-    ['1.2.3-beta', '=1.2.3-beta', true],
-    ['1.2.3-beta', 'v 1.2.3-beta', true],
-    ['1.2.3-beta', '= 1.2.3-beta', true],
-    ['1.2.3-beta', ' v1.2.3-beta', true],
-    ['1.2.3-beta', ' =1.2.3-beta', true],
-    ['1.2.3-beta', ' v 1.2.3-beta', true],
-    ['1.2.3-beta', ' = 1.2.3-beta', true],
-    ['1.2.3-beta+build', ' = 1.2.3-beta+otherbuild', true],
-    ['1.2.3+build', ' = 1.2.3+otherbuild', true],
-    ['1.2.3-beta+build', '1.2.3-beta+otherbuild'],
-    ['1.2.3+build', '1.2.3+otherbuild'],
-    ['  v1.2.3+build', '1.2.3+otherbuild']
-  ].forEach(function(v) {
-    var v0 = v[0];
-    var v1 = v[1];
-    var loose = v[2];
-    t.ok(eq(v0, v1, loose), "eq('" + v0 + "', '" + v1 + "')");
-    t.ok(!neq(v0, v1, loose), "!neq('" + v0 + "', '" + v1 + "')");
-    t.ok(cmp(v0, '==', v1, loose), 'cmp(' + v0 + '==' + v1 + ')');
-    t.ok(!cmp(v0, '!=', v1, loose), '!cmp(' + v0 + '!=' + v1 + ')');
-    t.ok(!cmp(v0, '===', v1, loose), '!cmp(' + v0 + '===' + v1 + ')');
-    t.ok(cmp(v0, '!==', v1, loose), 'cmp(' + v0 + '!==' + v1 + ')');
-    t.ok(!gt(v0, v1, loose), "!gt('" + v0 + "', '" + v1 + "')");
-    t.ok(gte(v0, v1, loose), "gte('" + v0 + "', '" + v1 + "')");
-    t.ok(!lt(v0, v1, loose), "!lt('" + v0 + "', '" + v1 + "')");
-    t.ok(lte(v0, v1, loose), "lte('" + v0 + "', '" + v1 + "')");
-  });
-  t.end();
-});
-
-
-test('\nrange tests', function(t) {
-  // [range, version]
-  // version should be included by range
-  [['1.0.0 - 2.0.0', '1.2.3'],
-    ['^1.2.3+build', '1.2.3'],
-    ['^1.2.3+build', '1.3.0'],
-    ['1.2.3-pre+asdf - 2.4.3-pre+asdf', '1.2.3'],
-    ['1.2.3pre+asdf - 2.4.3-pre+asdf', '1.2.3', true],
-    ['1.2.3-pre+asdf - 2.4.3pre+asdf', '1.2.3', true],
-    ['1.2.3pre+asdf - 2.4.3pre+asdf', '1.2.3', true],
-    ['1.2.3-pre+asdf - 2.4.3-pre+asdf', '1.2.3-pre.2'],
-    ['1.2.3-pre+asdf - 2.4.3-pre+asdf', '2.4.3-alpha'],
-    ['1.2.3+asdf - 2.4.3+asdf', '1.2.3'],
-    ['1.0.0', '1.0.0'],
-    ['>=*', '0.2.4'],
-    ['', '1.0.0'],
-    ['*', '1.2.3'],
-    ['*', 'v1.2.3', true],
-    ['>=1.0.0', '1.0.0'],
-    ['>=1.0.0', '1.0.1'],
-    ['>=1.0.0', '1.1.0'],
-    ['>1.0.0', '1.0.1'],
-    ['>1.0.0', '1.1.0'],
-    ['<=2.0.0', '2.0.0'],
-    ['<=2.0.0', '1.9999.9999'],
-    ['<=2.0.0', '0.2.9'],
-    ['<2.0.0', '1.9999.9999'],
-    ['<2.0.0', '0.2.9'],
-    ['>= 1.0.0', '1.0.0'],
-    ['>=  1.0.0', '1.0.1'],
-    ['>=   1.0.0', '1.1.0'],
-    ['> 1.0.0', '1.0.1'],
-    ['>  1.0.0', '1.1.0'],
-    ['<=   2.0.0', '2.0.0'],
-    ['<= 2.0.0', '1.9999.9999'],
-    ['<=  2.0.0', '0.2.9'],
-    ['<    2.0.0', '1.9999.9999'],
-    ['<\t2.0.0', '0.2.9'],
-    ['>=0.1.97', 'v0.1.97', true],
-    ['>=0.1.97', '0.1.97'],
-    ['0.1.20 || 1.2.4', '1.2.4'],
-    ['>=0.2.3 || <0.0.1', '0.0.0'],
-    ['>=0.2.3 || <0.0.1', '0.2.3'],
-    ['>=0.2.3 || <0.0.1', '0.2.4'],
-    ['||', '1.3.4'],
-    ['2.x.x', '2.1.3'],
-    ['1.2.x', '1.2.3'],
-    ['1.2.x || 2.x', '2.1.3'],
-    ['1.2.x || 2.x', '1.2.3'],
-    ['x', '1.2.3'],
-    ['2.*.*', '2.1.3'],
-    ['1.2.*', '1.2.3'],
-    ['1.2.* || 2.*', '2.1.3'],
-    ['1.2.* || 2.*', '1.2.3'],
-    ['*', '1.2.3'],
-    ['2', '2.1.2'],
-    ['2.3', '2.3.1'],
-    ['~2.4', '2.4.0'], // >=2.4.0 <2.5.0
-    ['~2.4', '2.4.5'],
-    ['~>3.2.1', '3.2.2'], // >=3.2.1 <3.3.0,
-    ['~1', '1.2.3'], // >=1.0.0 <2.0.0
-    ['~>1', '1.2.3'],
-    ['~> 1', '1.2.3'],
-    ['~1.0', '1.0.2'], // >=1.0.0 <1.1.0,
-    ['~ 1.0', '1.0.2'],
-    ['~ 1.0.3', '1.0.12'],
-    ['>=1', '1.0.0'],
-    ['>= 1', '1.0.0'],
-    ['<1.2', '1.1.1'],
-    ['< 1.2', '1.1.1'],
-    ['~v0.5.4-pre', '0.5.5'],
-    ['~v0.5.4-pre', '0.5.4'],
-    ['=0.7.x', '0.7.2'],
-    ['<=0.7.x', '0.7.2'],
-    ['>=0.7.x', '0.7.2'],
-    ['<=0.7.x', '0.6.2'],
-    ['~1.2.1 >=1.2.3', '1.2.3'],
-    ['~1.2.1 =1.2.3', '1.2.3'],
-    ['~1.2.1 1.2.3', '1.2.3'],
-    ['~1.2.1 >=1.2.3 1.2.3', '1.2.3'],
-    ['~1.2.1 1.2.3 >=1.2.3', '1.2.3'],
-    ['~1.2.1 1.2.3', '1.2.3'],
-    ['>=1.2.1 1.2.3', '1.2.3'],
-    ['1.2.3 >=1.2.1', '1.2.3'],
-    ['>=1.2.3 >=1.2.1', '1.2.3'],
-    ['>=1.2.1 >=1.2.3', '1.2.3'],
-    ['>=1.2', '1.2.8'],
-    ['^1.2.3', '1.8.1'],
-    ['^0.1.2', '0.1.2'],
-    ['^0.1', '0.1.2'],
-    ['^1.2', '1.4.2'],
-    ['^1.2 ^1', '1.4.2'],
-    ['^1.2.3-alpha', '1.2.3-pre'],
-    ['^1.2.0-alpha', '1.2.0-pre'],
-    ['^0.0.1-alpha', '0.0.1-beta']
-  ].forEach(function(v) {
-    var range = v[0];
-    var ver = v[1];
-    var loose = v[2];
-    t.ok(satisfies(ver, range, loose), range + ' satisfied by ' + ver);
-  });
-  t.end();
-});
-
-test('\nnegative range tests', function(t) {
-  // [range, version]
-  // version should not be included by range
-  [['1.0.0 - 2.0.0', '2.2.3'],
-    ['1.2.3+asdf - 2.4.3+asdf', '1.2.3-pre.2'],
-    ['1.2.3+asdf - 2.4.3+asdf', '2.4.3-alpha'],
-    ['^1.2.3+build', '2.0.0'],
-    ['^1.2.3+build', '1.2.0'],
-    ['^1.2.3', '1.2.3-pre'],
-    ['^1.2', '1.2.0-pre'],
-    ['>1.2', '1.3.0-beta'],
-    ['<=1.2.3', '1.2.3-beta'],
-    ['^1.2.3', '1.2.3-beta'],
-    ['=0.7.x', '0.7.0-asdf'],
-    ['>=0.7.x', '0.7.0-asdf'],
-    ['1', '1.0.0beta', true],
-    ['<1', '1.0.0beta', true],
-    ['< 1', '1.0.0beta', true],
-    ['1.0.0', '1.0.1'],
-    ['>=1.0.0', '0.0.0'],
-    ['>=1.0.0', '0.0.1'],
-    ['>=1.0.0', '0.1.0'],
-    ['>1.0.0', '0.0.1'],
-    ['>1.0.0', '0.1.0'],
-    ['<=2.0.0', '3.0.0'],
-    ['<=2.0.0', '2.9999.9999'],
-    ['<=2.0.0', '2.2.9'],
-    ['<2.0.0', '2.9999.9999'],
-    ['<2.0.0', '2.2.9'],
-    ['>=0.1.97', 'v0.1.93', true],
-    ['>=0.1.97', '0.1.93'],
-    ['0.1.20 || 1.2.4', '1.2.3'],
-    ['>=0.2.3 || <0.0.1', '0.0.3'],
-    ['>=0.2.3 || <0.0.1', '0.2.2'],
-    ['2.x.x', '1.1.3'],
-    ['2.x.x', '3.1.3'],
-    ['1.2.x', '1.3.3'],
-    ['1.2.x || 2.x', '3.1.3'],
-    ['1.2.x || 2.x', '1.1.3'],
-    ['2.*.*', '1.1.3'],
-    ['2.*.*', '3.1.3'],
-    ['1.2.*', '1.3.3'],
-    ['1.2.* || 2.*', '3.1.3'],
-    ['1.2.* || 2.*', '1.1.3'],
-    ['2', '1.1.2'],
-    ['2.3', '2.4.1'],
-    ['~2.4', '2.5.0'], // >=2.4.0 <2.5.0
-    ['~2.4', '2.3.9'],
-    ['~>3.2.1', '3.3.2'], // >=3.2.1 <3.3.0
-    ['~>3.2.1', '3.2.0'], // >=3.2.1 <3.3.0
-    ['~1', '0.2.3'], // >=1.0.0 <2.0.0
-    ['~>1', '2.2.3'],
-    ['~1.0', '1.1.0'], // >=1.0.0 <1.1.0
-    ['<1', '1.0.0'],
-    ['>=1.2', '1.1.1'],
-    ['1', '2.0.0beta', true],
-    ['~v0.5.4-beta', '0.5.4-alpha'],
-    ['=0.7.x', '0.8.2'],
-    ['>=0.7.x', '0.6.2'],
-    ['<0.7.x', '0.7.2'],
-    ['<1.2.3', '1.2.3-beta'],
-    ['=1.2.3', '1.2.3-beta'],
-    ['>1.2', '1.2.8'],
-    ['^1.2.3', '2.0.0-alpha'],
-    ['^1.2.3', '1.2.2'],
-    ['^1.2', '1.1.9'],
-    ['*', 'v1.2.3-foo', true],
-    // invalid ranges never satisfied!
-    ['blerg', '1.2.3'],
-    ['git+https://user:password0123@github.com/foo', '123.0.0', true],
-    ['^1.2.3', '2.0.0-pre']
-  ].forEach(function(v) {
-    var range = v[0];
-    var ver = v[1];
-    var loose = v[2];
-    var found = satisfies(ver, range, loose);
-    t.ok(!found, ver + ' not satisfied by ' + range);
-  });
-  t.end();
-});
-
-test('\nincrement versions test', function(t) {
-//  [version, inc, result, identifier]
-//  inc(version, inc) -> result
-  [['1.2.3', 'major', '2.0.0'],
-    ['1.2.3', 'minor', '1.3.0'],
-    ['1.2.3', 'patch', '1.2.4'],
-    ['1.2.3tag', 'major', '2.0.0', true],
-    ['1.2.3-tag', 'major', '2.0.0'],
-    ['1.2.3', 'fake', null],
-    ['1.2.0-0', 'patch', '1.2.0'],
-    ['fake', 'major', null],
-    ['1.2.3-4', 'major', '2.0.0'],
-    ['1.2.3-4', 'minor', '1.3.0'],
-    ['1.2.3-4', 'patch', '1.2.3'],
-    ['1.2.3-alpha.0.beta', 'major', '2.0.0'],
-    ['1.2.3-alpha.0.beta', 'minor', '1.3.0'],
-    ['1.2.3-alpha.0.beta', 'patch', '1.2.3'],
-    ['1.2.4', 'prerelease', '1.2.5-0'],
-    ['1.2.3-0', 'prerelease', '1.2.3-1'],
-    ['1.2.3-alpha.0', 'prerelease', '1.2.3-alpha.1'],
-    ['1.2.3-alpha.1', 'prerelease', '1.2.3-alpha.2'],
-    ['1.2.3-alpha.2', 'prerelease', '1.2.3-alpha.3'],
-    ['1.2.3-alpha.0.beta', 'prerelease', '1.2.3-alpha.1.beta'],
-    ['1.2.3-alpha.1.beta', 'prerelease', '1.2.3-alpha.2.beta'],
-    ['1.2.3-alpha.2.beta', 'prerelease', '1.2.3-alpha.3.beta'],
-    ['1.2.3-alpha.10.0.beta', 'prerelease', '1.2.3-alpha.10.1.beta'],
-    ['1.2.3-alpha.10.1.beta', 'prerelease', '1.2.3-alpha.10.2.beta'],
-    ['1.2.3-alpha.10.2.beta', 'prerelease', '1.2.3-alpha.10.3.beta'],
-    ['1.2.3-alpha.10.beta.0', 'prerelease', '1.2.3-alpha.10.beta.1'],
-    ['1.2.3-alpha.10.beta.1', 'prerelease', '1.2.3-alpha.10.beta.2'],
-    ['1.2.3-alpha.10.beta.2', 'prerelease', '1.2.3-alpha.10.beta.3'],
-    ['1.2.3-alpha.9.beta', 'prerelease', '1.2.3-alpha.10.beta'],
-    ['1.2.3-alpha.10.beta', 'prerelease', '1.2.3-alpha.11.beta'],
-    ['1.2.3-alpha.11.beta', 'prerelease', '1.2.3-alpha.12.beta'],
-    ['1.2.0', 'prepatch', '1.2.1-0'],
-    ['1.2.0-1', 'prepatch', '1.2.1-0'],
-    ['1.2.0', 'preminor', '1.3.0-0'],
-    ['1.2.3-1', 'preminor', '1.3.0-0'],
-    ['1.2.0', 'premajor', '2.0.0-0'],
-    ['1.2.3-1', 'premajor', '2.0.0-0'],
-    ['1.2.0-1', 'minor', '1.2.0'],
-    ['1.0.0-1', 'major', '1.0.0'],
-
-    ['1.2.3', 'major', '2.0.0', false, 'dev'],
-    ['1.2.3', 'minor', '1.3.0', false, 'dev'],
-    ['1.2.3', 'patch', '1.2.4', false, 'dev'],
-    ['1.2.3tag', 'major', '2.0.0', true, 'dev'],
-    ['1.2.3-tag', 'major', '2.0.0', false, 'dev'],
-    ['1.2.3', 'fake', null, false, 'dev'],
-    ['1.2.0-0', 'patch', '1.2.0', false, 'dev'],
-    ['fake', 'major', null, false, 'dev'],
-    ['1.2.3-4', 'major', '2.0.0', false, 'dev'],
-    ['1.2.3-4', 'minor', '1.3.0', false, 'dev'],
-    ['1.2.3-4', 'patch', '1.2.3', false, 'dev'],
-    ['1.2.3-alpha.0.beta', 'major', '2.0.0', false, 'dev'],
-    ['1.2.3-alpha.0.beta', 'minor', '1.3.0', false, 'dev'],
-    ['1.2.3-alpha.0.beta', 'patch', '1.2.3', false, 'dev'],
-    ['1.2.4', 'prerelease', '1.2.5-dev.0', false, 'dev'],
-    ['1.2.3-0', 'prerelease', '1.2.3-dev.0', false, 'dev'],
-    ['1.2.3-alpha.0', 'prerelease', '1.2.3-dev.0', false, 'dev'],
-    ['1.2.3-alpha.0', 'prerelease', '1.2.3-alpha.1', false, 'alpha'],
-    ['1.2.3-alpha.0.beta', 'prerelease', '1.2.3-dev.0', false, 'dev'],
-    ['1.2.3-alpha.0.beta', 'prerelease', '1.2.3-alpha.1.beta', false, 'alpha'],
-    ['1.2.3-alpha.10.0.beta', 'prerelease', '1.2.3-dev.0', false, 'dev'],
-    ['1.2.3-alpha.10.0.beta', 'prerelease', '1.2.3-alpha.10.1.beta', false, 'alpha'],
-    ['1.2.3-alpha.10.1.beta', 'prerelease', '1.2.3-alpha.10.2.beta', false, 'alpha'],
-    ['1.2.3-alpha.10.2.beta', 'prerelease', '1.2.3-alpha.10.3.beta', false, 'alpha'],
-    ['1.2.3-alpha.10.beta.0', 'prerelease', '1.2.3-dev.0', false, 'dev'],
-    ['1.2.3-alpha.10.beta.0', 'prerelease', '1.2.3-alpha.10.beta.1', false, 'alpha'],
-    ['1.2.3-alpha.10.beta.1', 'prerelease', '1.2.3-alpha.10.beta.2', false, 'alpha'],
-    ['1.2.3-alpha.10.beta.2', 'prerelease', '1.2.3-alpha.10.beta.3', false, 'alpha'],
-    ['1.2.3-alpha.9.beta', 'prerelease', '1.2.3-dev.0', false, 'dev'],
-    ['1.2.3-alpha.9.beta', 'prerelease', '1.2.3-alpha.10.beta', false, 'alpha'],
-    ['1.2.3-alpha.10.beta', 'prerelease', '1.2.3-alpha.11.beta', false, 'alpha'],
-    ['1.2.3-alpha.11.beta', 'prerelease', '1.2.3-alpha.12.beta', false, 'alpha'],
-    ['1.2.0', 'prepatch', '1.2.1-dev.0', false, 'dev'],
-    ['1.2.0-1', 'prepatch', '1.2.1-dev.0', false, 'dev'],
-    ['1.2.0', 'preminor', '1.3.0-dev.0', false, 'dev'],
-    ['1.2.3-1', 'preminor', '1.3.0-dev.0', false, 'dev'],
-    ['1.2.0', 'premajor', '2.0.0-dev.0', false, 'dev'],
-    ['1.2.3-1', 'premajor', '2.0.0-dev.0', false, 'dev'],
-    ['1.2.0-1', 'minor', '1.2.0', false, 'dev'],
-    ['1.0.0-1', 'major', '1.0.0', false, 'dev'],
-    ['1.2.3-dev.bar', 'prerelease', '1.2.3-dev.0', false, 'dev']
-
-  ].forEach(function(v) {
-    var pre = v[0];
-    var what = v[1];
-    var wanted = v[2];
-    var loose = v[3];
-    var id = v[4];
-    var found = inc(pre, what, loose, id);
-    var cmd = 'inc(' + pre + ', ' + what + ', ' + id + ')';
-    t.equal(found, wanted, cmd + ' === ' + wanted);
-
-    var parsed = semver.parse(pre, loose);
-    if (wanted) {
-      parsed.inc(what, id);
-      t.equal(parsed.version, wanted, cmd + ' object version updated');
-      t.equal(parsed.raw, wanted, cmd + ' object raw field updated');
-    } else if (parsed) {
-      t.throws(function () {
-        parsed.inc(what, id)
-      })
-    } else {
-      t.equal(parsed, null)
-    }
-  });
-
-  t.end();
-});
-
-test('\ndiff versions test', function(t) {
-//  [version1, version2, result]
-//  diff(version1, version2) -> result
-  [['1.2.3', '0.2.3', 'major'],
-    ['1.4.5', '0.2.3', 'major'],
-    ['1.2.3', '2.0.0-pre', 'premajor'],
-    ['1.2.3', '1.3.3', 'minor'],
-    ['1.0.1', '1.1.0-pre', 'preminor'],
-    ['1.2.3', '1.2.4', 'patch'],
-    ['1.2.3', '1.2.4-pre', 'prepatch'],
-    ['0.0.1', '0.0.1-pre', 'prerelease'],
-    ['0.0.1', '0.0.1-pre-2', 'prerelease'],
-    ['1.1.0', '1.1.0-pre', 'prerelease'],
-    ['1.1.0-pre-1', '1.1.0-pre-2', 'prerelease'],
-    ['1.0.0', '1.0.0', null]
-
-  ].forEach(function(v) {
-    var version1 = v[0];
-    var version2 = v[1];
-    var wanted = v[2];
-    var found = diff(version1, version2);
-    var cmd = 'diff(' + version1 + ', ' + version2 + ')';
-    t.equal(found, wanted, cmd + ' === ' + wanted);
-  });
-
-  t.end();
-});
-
-test('\nvalid range test', function(t) {
-  // [range, result]
-  // validRange(range) -> result
-  // translate ranges into their canonical form
-  [['1.0.0 - 2.0.0', '>=1.0.0 <=2.0.0'],
-    ['1.0.0', '1.0.0'],
-    ['>=*', '*'],
-    ['', '*'],
-    ['*', '*'],
-    ['*', '*'],
-    ['>=1.0.0', '>=1.0.0'],
-    ['>1.0.0', '>1.0.0'],
-    ['<=2.0.0', '<=2.0.0'],
-    ['1', '>=1.0.0 <2.0.0'],
-    ['<=2.0.0', '<=2.0.0'],
-    ['<=2.0.0', '<=2.0.0'],
-    ['<2.0.0', '<2.0.0'],
-    ['<2.0.0', '<2.0.0'],
-    ['>= 1.0.0', '>=1.0.0'],
-    ['>=  1.0.0', '>=1.0.0'],
-    ['>=   1.0.0', '>=1.0.0'],
-    ['> 1.0.0', '>1.0.0'],
-    ['>  1.0.0', '>1.0.0'],
-    ['<=   2.0.0', '<=2.0.0'],
-    ['<= 2.0.0', '<=2.0.0'],
-    ['<=  2.0.0', '<=2.0.0'],
-    ['<    2.0.0', '<2.0.0'],
-    ['<	2.0.0', '<2.0.0'],
-    ['>=0.1.97', '>=0.1.97'],
-    ['>=0.1.97', '>=0.1.97'],
-    ['0.1.20 || 1.2.4', '0.1.20||1.2.4'],
-    ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1'],
-    ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1'],
-    ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1'],
-    ['||', '||'],
-    ['2.x.x', '>=2.0.0 <3.0.0'],
-    ['1.2.x', '>=1.2.0 <1.3.0'],
-    ['1.2.x || 2.x', '>=1.2.0 <1.3.0||>=2.0.0 <3.0.0'],
-    ['1.2.x || 2.x', '>=1.2.0 <1.3.0||>=2.0.0 <3.0.0'],
-    ['x', '*'],
-    ['2.*.*', '>=2.0.0 <3.0.0'],
-    ['1.2.*', '>=1.2.0 <1.3.0'],
-    ['1.2.* || 2.*', '>=1.2.0 <1.3.0||>=2.0.0 <3.0.0'],
-    ['*', '*'],
-    ['2', '>=2.0.0 <3.0.0'],
-    ['2.3', '>=2.3.0 <2.4.0'],
-    ['~2.4', '>=2.4.0 <2.5.0'],
-    ['~2.4', '>=2.4.0 <2.5.0'],
-    ['~>3.2.1', '>=3.2.1 <3.3.0'],
-    ['~1', '>=1.0.0 <2.0.0'],
-    ['~>1', '>=1.0.0 <2.0.0'],
-    ['~> 1', '>=1.0.0 <2.0.0'],
-    ['~1.0', '>=1.0.0 <1.1.0'],
-    ['~ 1.0', '>=1.0.0 <1.1.0'],
-    ['^0', '>=0.0.0 <1.0.0'],
-    ['^ 1', '>=1.0.0 <2.0.0'],
-    ['^0.1', '>=0.1.0 <0.2.0'],
-    ['^1.0', '>=1.0.0 <2.0.0'],
-    ['^1.2', '>=1.2.0 <2.0.0'],
-    ['^0.0.1', '>=0.0.1 <0.0.2'],
-    ['^0.0.1-beta', '>=0.0.1-beta <0.0.2'],
-    ['^0.1.2', '>=0.1.2 <0.2.0'],
-    ['^1.2.3', '>=1.2.3 <2.0.0'],
-    ['^1.2.3-beta.4', '>=1.2.3-beta.4 <2.0.0'],
-    ['<1', '<1.0.0'],
-    ['< 1', '<1.0.0'],
-    ['>=1', '>=1.0.0'],
-    ['>= 1', '>=1.0.0'],
-    ['<1.2', '<1.2.0'],
-    ['< 1.2', '<1.2.0'],
-    ['1', '>=1.0.0 <2.0.0'],
-    ['>01.02.03', '>1.2.3', true],
-    ['>01.02.03', null],
-    ['~1.2.3beta', '>=1.2.3-beta <1.3.0', true],
-    ['~1.2.3beta', null],
-    ['^ 1.2 ^ 1', '>=1.2.0 <2.0.0 >=1.0.0 <2.0.0']
-  ].forEach(function(v) {
-    var pre = v[0];
-    var wanted = v[1];
-    var loose = v[2];
-    var found = validRange(pre, loose);
-
-    t.equal(found, wanted, 'validRange(' + pre + ') === ' + wanted);
-  });
-
-  t.end();
-});
-
-test('\ncomparators test', function(t) {
-  // [range, comparators]
-  // turn range into a set of individual comparators
-  [['1.0.0 - 2.0.0', [['>=1.0.0', '<=2.0.0']]],
-    ['1.0.0', [['1.0.0']]],
-    ['>=*', [['']]],
-    ['', [['']]],
-    ['*', [['']]],
-    ['*', [['']]],
-    ['>=1.0.0', [['>=1.0.0']]],
-    ['>=1.0.0', [['>=1.0.0']]],
-    ['>=1.0.0', [['>=1.0.0']]],
-    ['>1.0.0', [['>1.0.0']]],
-    ['>1.0.0', [['>1.0.0']]],
-    ['<=2.0.0', [['<=2.0.0']]],
-    ['1', [['>=1.0.0', '<2.0.0']]],
-    ['<=2.0.0', [['<=2.0.0']]],
-    ['<=2.0.0', [['<=2.0.0']]],
-    ['<2.0.0', [['<2.0.0']]],
-    ['<2.0.0', [['<2.0.0']]],
-    ['>= 1.0.0', [['>=1.0.0']]],
-    ['>=  1.0.0', [['>=1.0.0']]],
-    ['>=   1.0.0', [['>=1.0.0']]],
-    ['> 1.0.0', [['>1.0.0']]],
-    ['>  1.0.0', [['>1.0.0']]],
-    ['<=   2.0.0', [['<=2.0.0']]],
-    ['<= 2.0.0', [['<=2.0.0']]],
-    ['<=  2.0.0', [['<=2.0.0']]],
-    ['<    2.0.0', [['<2.0.0']]],
-    ['<\t2.0.0', [['<2.0.0']]],
-    ['>=0.1.97', [['>=0.1.97']]],
-    ['>=0.1.97', [['>=0.1.97']]],
-    ['0.1.20 || 1.2.4', [['0.1.20'], ['1.2.4']]],
-    ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1']]],
-    ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1']]],
-    ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1']]],
-    ['||', [[''], ['']]],
-    ['2.x.x', [['>=2.0.0', '<3.0.0']]],
-    ['1.2.x', [['>=1.2.0', '<1.3.0']]],
-    ['1.2.x || 2.x', [['>=1.2.0', '<1.3.0'], ['>=2.0.0', '<3.0.0']]],
-    ['1.2.x || 2.x', [['>=1.2.0', '<1.3.0'], ['>=2.0.0', '<3.0.0']]],
-    ['x', [['']]],
-    ['2.*.*', [['>=2.0.0', '<3.0.0']]],
-    ['1.2.*', [['>=1.2.0', '<1.3.0']]],
-    ['1.2.* || 2.*', [['>=1.2.0', '<1.3.0'], ['>=2.0.0', '<3.0.0']]],
-    ['1.2.* || 2.*', [['>=1.2.0', '<1.3.0'], ['>=2.0.0', '<3.0.0']]],
-    ['*', [['']]],
-    ['2', [['>=2.0.0', '<3.0.0']]],
-    ['2.3', [['>=2.3.0', '<2.4.0']]],
-    ['~2.4', [['>=2.4.0', '<2.5.0']]],
-    ['~2.4', [['>=2.4.0', '<2.5.0']]],
-    ['~>3.2.1', [['>=3.2.1', '<3.3.0']]],
-    ['~1', [['>=1.0.0', '<2.0.0']]],
-    ['~>1', [['>=1.0.0', '<2.0.0']]],
-    ['~> 1', [['>=1.0.0', '<2.0.0']]],
-    ['~1.0', [['>=1.0.0', '<1.1.0']]],
-    ['~ 1.0', [['>=1.0.0', '<1.1.0']]],
-    ['~ 1.0.3', [['>=1.0.3', '<1.1.0']]],
-    ['~> 1.0.3', [['>=1.0.3', '<1.1.0']]],
-    ['<1', [['<1.0.0']]],
-    ['< 1', [['<1.0.0']]],
-    ['>=1', [['>=1.0.0']]],
-    ['>= 1', [['>=1.0.0']]],
-    ['<1.2', [['<1.2.0']]],
-    ['< 1.2', [['<1.2.0']]],
-    ['1', [['>=1.0.0', '<2.0.0']]],
-    ['1 2', [['>=1.0.0', '<2.0.0', '>=2.0.0', '<3.0.0']]],
-    ['1.2 - 3.4.5', [['>=1.2.0', '<=3.4.5']]],
-    ['1.2.3 - 3.4', [['>=1.2.3', '<3.5.0']]],
-    ['1.2.3 - 3', [['>=1.2.3', '<4.0.0']]],
-    ['>*', [['<0.0.0']]],
-    ['<*', [['<0.0.0']]]
-  ].forEach(function(v) {
-    var pre = v[0];
-    var wanted = v[1];
-    var found = toComparators(v[0]);
-    var jw = JSON.stringify(wanted);
-    t.equivalent(found, wanted, 'toComparators(' + pre + ') === ' + jw);
-  });
-
-  t.end();
-});
-
-test('\ninvalid version numbers', function(t) {
-  ['1.2.3.4',
-   'NOT VALID',
-   1.2,
-   null,
-   'Infinity.NaN.Infinity'
-  ].forEach(function(v) {
-    t.throws(function() {
-      new SemVer(v);
-    }, {name:'TypeError', message:'Invalid Version: ' + v});
-  });
-
-  t.end();
-});
-
-test('\nstrict vs loose version numbers', function(t) {
-  [['=1.2.3', '1.2.3'],
-    ['01.02.03', '1.2.3'],
-    ['1.2.3-beta.01', '1.2.3-beta.1'],
-    ['   =1.2.3', '1.2.3'],
-    ['1.2.3foo', '1.2.3-foo']
-  ].forEach(function(v) {
-    var loose = v[0];
-    var strict = v[1];
-    t.throws(function() {
-      new SemVer(loose);
-    });
-    var lv = new SemVer(loose, true);
-    t.equal(lv.version, strict);
-    t.ok(eq(loose, strict, true));
-    t.throws(function() {
-      eq(loose, strict);
-    });
-    t.throws(function() {
-      new SemVer(strict).compare(loose);
-    });
-  });
-  t.end();
-});
-
-test('\nstrict vs loose ranges', function(t) {
-  [['>=01.02.03', '>=1.2.3'],
-    ['~1.02.03beta', '>=1.2.3-beta <1.3.0']
-  ].forEach(function(v) {
-    var loose = v[0];
-    var comps = v[1];
-    t.throws(function() {
-      new Range(loose);
-    });
-    t.equal(new Range(loose, true).range, comps);
-  });
-  t.end();
-});
-
-test('\nmax satisfying', function(t) {
-  [[['1.2.3', '1.2.4'], '1.2', '1.2.4'],
-    [['1.2.4', '1.2.3'], '1.2', '1.2.4'],
-    [['1.2.3', '1.2.4', '1.2.5', '1.2.6'], '~1.2.3', '1.2.6'],
-    [['1.1.0', '1.2.0', '1.2.1', '1.3.0', '2.0.0b1', '2.0.0b2', '2.0.0b3', '2.0.0', '2.1.0'], '~2.0.0', '2.0.0', true]
-  ].forEach(function(v) {
-    var versions = v[0];
-    var range = v[1];
-    var expect = v[2];
-    var loose = v[3];
-    var actual = semver.maxSatisfying(versions, range, loose);
-    t.equal(actual, expect);
-  });
-  t.end();
-});
--- a/node_modules/semver/test/ltr.js
+++ b/node_modules/semver/test/ltr.js
@@ -1,181 +0,0 @@
-var tap = require('tap');
-var test = tap.test;
-var semver = require('../semver.js');
-var ltr = semver.ltr;
-
-test('\nltr tests', function(t) {
-  // [range, version, loose]
-  // Version should be less than range
-  [
-    ['~1.2.2', '1.2.1'],
-    ['~0.6.1-1', '0.6.1-0'],
-    ['1.0.0 - 2.0.0', '0.0.1'],
-    ['1.0.0-beta.2', '1.0.0-beta.1'],
-    ['1.0.0', '0.0.0'],
-    ['>=2.0.0', '1.1.1'],
-    ['>=2.0.0', '1.2.9'],
-    ['>2.0.0', '2.0.0'],
-    ['0.1.20 || 1.2.4', '0.1.5'],
-    ['2.x.x', '1.0.0'],
-    ['1.2.x', '1.1.0'],
-    ['1.2.x || 2.x', '1.0.0'],
-    ['2.*.*', '1.0.1'],
-    ['1.2.*', '1.1.3'],
-    ['1.2.* || 2.*', '1.1.9999'],
-    ['2', '1.0.0'],
-    ['2.3', '2.2.2'],
-    ['~2.4', '2.3.0'], // >=2.4.0 <2.5.0
-    ['~2.4', '2.3.5'],
-    ['~>3.2.1', '3.2.0'], // >=3.2.1 <3.3.0
-    ['~1', '0.2.3'], // >=1.0.0 <2.0.0
-    ['~>1', '0.2.4'],
-    ['~> 1', '0.2.3'],
-    ['~1.0', '0.1.2'], // >=1.0.0 <1.1.0
-    ['~ 1.0', '0.1.0'],
-    ['>1.2', '1.2.0'],
-    ['> 1.2', '1.2.1'],
-    ['1', '0.0.0beta', true],
-    ['~v0.5.4-pre', '0.5.4-alpha'],
-    ['~v0.5.4-pre', '0.5.4-alpha'],
-    ['=0.7.x', '0.6.0'],
-    ['=0.7.x', '0.6.0-asdf'],
-    ['>=0.7.x', '0.6.0'],
-    ['~1.2.2', '1.2.1'],
-    ['1.0.0 - 2.0.0', '0.2.3'],
-    ['1.0.0', '0.0.1'],
-    ['>=2.0.0', '1.0.0'],
-    ['>=2.0.0', '1.9999.9999'],
-    ['>=2.0.0', '1.2.9'],
-    ['>2.0.0', '2.0.0'],
-    ['>2.0.0', '1.2.9'],
-    ['2.x.x', '1.1.3'],
-    ['1.2.x', '1.1.3'],
-    ['1.2.x || 2.x', '1.1.3'],
-    ['2.*.*', '1.1.3'],
-    ['1.2.*', '1.1.3'],
-    ['1.2.* || 2.*', '1.1.3'],
-    ['2', '1.9999.9999'],
-    ['2.3', '2.2.1'],
-    ['~2.4', '2.3.0'], // >=2.4.0 <2.5.0
-    ['~>3.2.1', '2.3.2'], // >=3.2.1 <3.3.0
-    ['~1', '0.2.3'], // >=1.0.0 <2.0.0
-    ['~>1', '0.2.3'],
-    ['~1.0', '0.0.0'], // >=1.0.0 <1.1.0
-    ['>1', '1.0.0'],
-    ['2', '1.0.0beta', true],
-    ['>1', '1.0.0beta', true],
-    ['> 1', '1.0.0beta', true],
-    ['=0.7.x', '0.6.2'],
-    ['=0.7.x', '0.7.0-asdf'],
-    ['^1', '1.0.0-0'],
-    ['>=0.7.x', '0.7.0-asdf'],
-    ['1', '1.0.0beta', true],
-    ['>=0.7.x', '0.6.2'],
-    ['>1.2.3', '1.3.0-alpha']
-  ].forEach(function(tuple) {
-    var range = tuple[0];
-    var version = tuple[1];
-    var loose = tuple[2] || false;
-    var msg = 'ltr(' + version + ', ' + range + ', ' + loose + ')';
-    t.ok(ltr(version, range, loose), msg);
-  });
-  t.end();
-});
-
-test('\nnegative ltr tests', function(t) {
-  // [range, version, loose]
-  // Version should NOT be less than range
-  [
-    ['~ 1.0', '1.1.0'],
-    ['~0.6.1-1', '0.6.1-1'],
-    ['1.0.0 - 2.0.0', '1.2.3'],
-    ['1.0.0 - 2.0.0', '2.9.9'],
-    ['1.0.0', '1.0.0'],
-    ['>=*', '0.2.4'],
-    ['', '1.0.0', true],
-    ['*', '1.2.3'],
-    ['>=1.0.0', '1.0.0'],
-    ['>=1.0.0', '1.0.1'],
-    ['>=1.0.0', '1.1.0'],
-    ['>1.0.0', '1.0.1'],
-    ['>1.0.0', '1.1.0'],
-    ['<=2.0.0', '2.0.0'],
-    ['<=2.0.0', '1.9999.9999'],
-    ['<=2.0.0', '0.2.9'],
-    ['<2.0.0', '1.9999.9999'],
-    ['<2.0.0', '0.2.9'],
-    ['>= 1.0.0', '1.0.0'],
-    ['>=  1.0.0', '1.0.1'],
-    ['>=   1.0.0', '1.1.0'],
-    ['> 1.0.0', '1.0.1'],
-    ['>  1.0.0', '1.1.0'],
-    ['<=   2.0.0', '2.0.0'],
-    ['<= 2.0.0', '1.9999.9999'],
-    ['<=  2.0.0', '0.2.9'],
-    ['<    2.0.0', '1.9999.9999'],
-    ['<\t2.0.0', '0.2.9'],
-    ['>=0.1.97', 'v0.1.97'],
-    ['>=0.1.97', '0.1.97'],
-    ['0.1.20 || 1.2.4', '1.2.4'],
-    ['0.1.20 || >1.2.4', '1.2.4'],
-    ['0.1.20 || 1.2.4', '1.2.3'],
-    ['0.1.20 || 1.2.4', '0.1.20'],
-    ['>=0.2.3 || <0.0.1', '0.0.0'],
-    ['>=0.2.3 || <0.0.1', '0.2.3'],
-    ['>=0.2.3 || <0.0.1', '0.2.4'],
-    ['||', '1.3.4'],
-    ['2.x.x', '2.1.3'],
-    ['1.2.x', '1.2.3'],
-    ['1.2.x || 2.x', '2.1.3'],
-    ['1.2.x || 2.x', '1.2.3'],
-    ['x', '1.2.3'],
-    ['2.*.*', '2.1.3'],
-    ['1.2.*', '1.2.3'],
-    ['1.2.* || 2.*', '2.1.3'],
-    ['1.2.* || 2.*', '1.2.3'],
-    ['1.2.* || 2.*', '1.2.3'],
-    ['*', '1.2.3'],
-    ['2', '2.1.2'],
-    ['2.3', '2.3.1'],
-    ['~2.4', '2.4.0'], // >=2.4.0 <2.5.0
-    ['~2.4', '2.4.5'],
-    ['~>3.2.1', '3.2.2'], // >=3.2.1 <3.3.0
-    ['~1', '1.2.3'], // >=1.0.0 <2.0.0
-    ['~>1', '1.2.3'],
-    ['~> 1', '1.2.3'],
-    ['~1.0', '1.0.2'], // >=1.0.0 <1.1.0
-    ['~ 1.0', '1.0.2'],
-    ['>=1', '1.0.0'],
-    ['>= 1', '1.0.0'],
-    ['<1.2', '1.1.1'],
-    ['< 1.2', '1.1.1'],
-    ['~v0.5.4-pre', '0.5.5'],
-    ['~v0.5.4-pre', '0.5.4'],
-    ['=0.7.x', '0.7.2'],
-    ['>=0.7.x', '0.7.2'],
-    ['<=0.7.x', '0.6.2'],
-    ['>0.2.3 >0.2.4 <=0.2.5', '0.2.5'],
-    ['>=0.2.3 <=0.2.4', '0.2.4'],
-    ['1.0.0 - 2.0.0', '2.0.0'],
-    ['^3.0.0', '4.0.0'],
-    ['^1.0.0 || ~2.0.1', '2.0.0'],
-    ['^0.1.0 || ~3.0.1 || 5.0.0', '3.2.0'],
-    ['^0.1.0 || ~3.0.1 || 5.0.0', '1.0.0beta', true],
-    ['^0.1.0 || ~3.0.1 || 5.0.0', '5.0.0-0', true],
-    ['^0.1.0 || ~3.0.1 || >4 <=5.0.0', '3.5.0'],
-    ['^1.0.0alpha', '1.0.0beta', true],
-    ['~1.0.0alpha', '1.0.0beta', true],
-    ['^1.0.0-alpha', '1.0.0beta', true],
-    ['~1.0.0-alpha', '1.0.0beta', true],
-    ['^1.0.0-alpha', '1.0.0-beta'],
-    ['~1.0.0-alpha', '1.0.0-beta'],
-    ['=0.1.0', '1.0.0']
-  ].forEach(function(tuple) {
-    var range = tuple[0];
-    var version = tuple[1];
-    var loose = tuple[2] || false;
-    var msg = '!ltr(' + version + ', ' + range + ', ' + loose + ')';
-    t.notOk(ltr(version, range, loose), msg);
-  });
-  t.end();
-});
--- a/node_modules/semver/test/major-minor-patch.js
+++ b/node_modules/semver/test/major-minor-patch.js
@@ -1,72 +0,0 @@
-var tap = require('tap');
-var test = tap.test;
-var semver = require('../semver.js');
-
-test('\nmajor tests', function(t) {
-  // [range, version]
-  // Version should be detectable despite extra characters
-  [
-    ['1.2.3', 1],
-    [' 1.2.3 ', 1],
-    [' 2.2.3-4 ', 2],
-    [' 3.2.3-pre ', 3],
-    ['v5.2.3', 5],
-    [' v8.2.3 ', 8],
-    ['\t13.2.3', 13],
-    ['=21.2.3', 21, true],
-    ['v=34.2.3', 34, true]
-  ].forEach(function(tuple) {
-    var range = tuple[0];
-    var version = tuple[1];
-    var loose = tuple[2] || false;
-    var msg = 'major(' + range + ') = ' + version;
-    t.equal(semver.major(range, loose), version, msg);
-  });
-  t.end();
-});
-
-test('\nminor tests', function(t) {
-  // [range, version]
-  // Version should be detectable despite extra characters
-  [
-    ['1.1.3', 1],
-    [' 1.1.3 ', 1],
-    [' 1.2.3-4 ', 2],
-    [' 1.3.3-pre ', 3],
-    ['v1.5.3', 5],
-    [' v1.8.3 ', 8],
-    ['\t1.13.3', 13],
-    ['=1.21.3', 21, true],
-    ['v=1.34.3', 34, true]
-  ].forEach(function(tuple) {
-    var range = tuple[0];
-    var version = tuple[1];
-    var loose = tuple[2] || false;
-    var msg = 'minor(' + range + ') = ' + version;
-    t.equal(semver.minor(range, loose), version, msg);
-  });
-  t.end();
-});
-
-test('\npatch tests', function(t) {
-  // [range, version]
-  // Version should be detectable despite extra characters
-  [
-    ['1.2.1', 1],
-    [' 1.2.1 ', 1],
-    [' 1.2.2-4 ', 2],
-    [' 1.2.3-pre ', 3],
-    ['v1.2.5', 5],
-    [' v1.2.8 ', 8],
-    ['\t1.2.13', 13],
-    ['=1.2.21', 21, true],
-    ['v=1.2.34', 34, true]
-  ].forEach(function(tuple) {
-    var range = tuple[0];
-    var version = tuple[1];
-    var loose = tuple[2] || false;
-    var msg = 'patch(' + range + ') = ' + version;
-    t.equal(semver.patch(range, loose), version, msg);
-  });
-  t.end();
-});
--- a/node_modules/shelljs/package.json
+++ b/node_modules/shelljs/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "shelljs@^0.5.3",
-      "D:\\Cordova\\cordova-android"
+      {
+        "raw": "shelljs@^0.5.3",
+        "scope": null,
+        "escapedName": "shelljs",
+        "name": "shelljs",
+        "rawSpec": "^0.5.3",
+        "spec": ">=0.5.3 <0.6.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android"
    ]
  ],
  "_from": "shelljs@>=0.5.3 <0.6.0",
@@ -12,16 +20,17 @@
  "_location": "/shelljs",
  "_nodeVersion": "1.2.0",
  "_npmUser": {
-    "email": "arturadib@gmail.com",
-    "name": "artur"
+    "name": "artur",
+    "email": "arturadib@gmail.com"
  },
  "_npmVersion": "2.5.1",
  "_phantomChildren": {},
  "_requested": {
-    "name": "shelljs",
    "raw": "shelljs@^0.5.3",
-    "rawSpec": "^0.5.3",
    "scope": null,
+    "escapedName": "shelljs",
+    "name": "shelljs",
+    "rawSpec": "^0.5.3",
    "spec": ">=0.5.3 <0.6.0",
    "type": "range"
  },
@@ -33,10 +42,10 @@
  "_shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113",
  "_shrinkwrap": null,
  "_spec": "shelljs@^0.5.3",
-  "_where": "D:\\Cordova\\cordova-android",
+  "_where": "d:\\cordova\\cordova-android",
  "author": {
-    "email": "arturadib@gmail.com",
-    "name": "Artur Adib"
+    "name": "Artur Adib",
+    "email": "arturadib@gmail.com"
  },
  "bin": {
    "shjs": "./bin/shjs"
@@ -71,8 +80,8 @@
  "main": "./shell.js",
  "maintainers": [
    {
-      "email": "arturadib@gmail.com",
-      "name": "artur"
+      "name": "artur",
+      "email": "arturadib@gmail.com"
    }
  ],
  "name": "shelljs",
--- a/node_modules/underscore/package.json
+++ b/node_modules/underscore/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "underscore@^1.8.3",
-      "D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
+      {
+        "raw": "underscore@^1.8.3",
+        "scope": null,
+        "escapedName": "underscore",
+        "name": "underscore",
+        "rawSpec": "^1.8.3",
+        "spec": ">=1.8.3 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "underscore@>=1.8.3 <2.0.0",
@@ -11,16 +19,17 @@
  "_installable": true,
  "_location": "/underscore",
  "_npmUser": {
-    "email": "jashkenas@gmail.com",
-    "name": "jashkenas"
+    "name": "jashkenas",
+    "email": "jashkenas@gmail.com"
  },
  "_npmVersion": "1.4.28",
  "_phantomChildren": {},
  "_requested": {
-    "name": "underscore",
    "raw": "underscore@^1.8.3",
-    "rawSpec": "^1.8.3",
    "scope": null,
+    "escapedName": "underscore",
+    "name": "underscore",
+    "rawSpec": "^1.8.3",
    "spec": ">=1.8.3 <2.0.0",
    "type": "range"
  },
@@ -31,10 +40,10 @@
  "_shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022",
  "_shrinkwrap": null,
  "_spec": "underscore@^1.8.3",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
-    "email": "jeremy@documentcloud.org",
-    "name": "Jeremy Ashkenas"
+    "name": "Jeremy Ashkenas",
+    "email": "jeremy@documentcloud.org"
  },
  "bugs": {
    "url": "https://github.com/jashkenas/underscore/issues"
@@ -73,8 +82,8 @@
  "main": "underscore.js",
  "maintainers": [
    {
-      "email": "jashkenas@gmail.com",
-      "name": "jashkenas"
+      "name": "jashkenas",
+      "email": "jashkenas@gmail.com"
    }
  ],
  "name": "underscore",
--- a/node_modules/unorm/package.json
+++ b/node_modules/unorm/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "unorm@^1.3.3",
-      "D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
+      {
+        "raw": "unorm@^1.3.3",
+        "scope": null,
+        "escapedName": "unorm",
+        "name": "unorm",
+        "rawSpec": "^1.3.3",
+        "spec": ">=1.3.3 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "unorm@>=1.3.3 <2.0.0",
@@ -11,16 +19,17 @@
  "_installable": true,
  "_location": "/unorm",
  "_npmUser": {
-    "email": "bwp@bwp.dk",
-    "name": "walling"
+    "name": "walling",
+    "email": "bwp@bwp.dk"
  },
  "_npmVersion": "1.4.28",
  "_phantomChildren": {},
  "_requested": {
-    "name": "unorm",
    "raw": "unorm@^1.3.3",
-    "rawSpec": "^1.3.3",
    "scope": null,
+    "escapedName": "unorm",
+    "name": "unorm",
+    "rawSpec": "^1.3.3",
    "spec": ">=1.3.3 <2.0.0",
    "type": "range"
  },
@@ -31,26 +40,26 @@
  "_shasum": "364200d5f13646ca8bcd44490271335614792300",
  "_shrinkwrap": null,
  "_spec": "unorm@^1.3.3",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
-    "email": "bwp@bwp.dk",
-    "name": "Bjarke Walling"
+    "name": "Bjarke Walling",
+    "email": "bwp@bwp.dk"
  },
  "bugs": {
    "url": "https://github.com/walling/unorm/issues"
  },
  "contributors": [
    {
-      "email": "bwp@bwp.dk",
-      "name": "Bjarke Walling"
+      "name": "Bjarke Walling",
+      "email": "bwp@bwp.dk"
    },
    {
-      "email": "oleg.grenrus@iki.fi",
-      "name": "Oleg Grenrus"
+      "name": "Oleg Grenrus",
+      "email": "oleg.grenrus@iki.fi"
    },
    {
-      "email": "matsuza@gmail.com",
-      "name": "Matsuza"
+      "name": "Matsuza",
+      "email": "matsuza@gmail.com"
    }
  ],
  "dependencies": {},
@@ -66,7 +75,7 @@
  "directories": {},
  "dist": {
    "shasum": "364200d5f13646ca8bcd44490271335614792300",
-    "tarball": "http://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz"
+    "tarball": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz"
  },
  "engines": {
    "node": ">= 0.4.0"
@@ -77,8 +86,8 @@
  "main": "./lib/unorm.js",
  "maintainers": [
    {
-      "email": "bwp@bwp.dk",
-      "name": "walling"
+      "name": "walling",
+      "email": "bwp@bwp.dk"
    }
  ],
  "name": "unorm",
--- a/node_modules/util-deprecate/package.json
+++ b/node_modules/util-deprecate/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "util-deprecate@1.0.2",
-      "D:\\Cordova\\cordova-android\\node_modules\\plist"
+      {
+        "raw": "util-deprecate@1.0.2",
+        "scope": null,
+        "escapedName": "util-deprecate",
+        "name": "util-deprecate",
+        "rawSpec": "1.0.2",
+        "spec": "1.0.2",
+        "type": "version"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\plist"
    ]
  ],
  "_from": "util-deprecate@1.0.2",
@@ -12,16 +20,17 @@
  "_location": "/util-deprecate",
  "_nodeVersion": "4.1.2",
  "_npmUser": {
-    "email": "nathan@tootallnate.net",
-    "name": "tootallnate"
+    "name": "tootallnate",
+    "email": "nathan@tootallnate.net"
  },
  "_npmVersion": "2.14.4",
  "_phantomChildren": {},
  "_requested": {
-    "name": "util-deprecate",
    "raw": "util-deprecate@1.0.2",
-    "rawSpec": "1.0.2",
    "scope": null,
+    "escapedName": "util-deprecate",
+    "name": "util-deprecate",
+    "rawSpec": "1.0.2",
    "spec": "1.0.2",
    "type": "version"
  },
@@ -32,10 +41,10 @@
  "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
  "_shrinkwrap": null,
  "_spec": "util-deprecate@1.0.2",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\plist",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\plist",
  "author": {
-    "email": "nathan@tootallnate.net",
    "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
    "url": "http://n8.io/"
  },
  "browser": "browser.js",
@@ -63,8 +72,8 @@
  "main": "node.js",
  "maintainers": [
    {
-      "email": "nathan@tootallnate.net",
-      "name": "tootallnate"
+      "name": "tootallnate",
+      "email": "nathan@tootallnate.net"
    }
  ],
  "name": "util-deprecate",
--- a/node_modules/wrappy/package.json
+++ b/node_modules/wrappy/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "wrappy@1",
-      "D:\\Cordova\\cordova-android\\node_modules\\inflight"
+      {
+        "raw": "wrappy@1",
+        "scope": null,
+        "escapedName": "wrappy",
+        "name": "wrappy",
+        "rawSpec": "1",
+        "spec": ">=1.0.0 <2.0.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\inflight"
    ]
  ],
  "_from": "wrappy@>=1.0.0 <2.0.0",
@@ -16,16 +24,17 @@
    "tmp": "tmp/wrappy-1.0.2.tgz_1463527848281_0.037129373755306005"
  },
  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
  },
  "_npmVersion": "3.9.1",
  "_phantomChildren": {},
  "_requested": {
-    "name": "wrappy",
    "raw": "wrappy@1",
-    "rawSpec": "1",
    "scope": null,
+    "escapedName": "wrappy",
+    "name": "wrappy",
+    "rawSpec": "1",
    "spec": ">=1.0.0 <2.0.0",
    "type": "range"
  },
@@ -37,10 +46,10 @@
  "_shasum": "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f",
  "_shrinkwrap": null,
  "_spec": "wrappy@1",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\inflight",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\inflight",
  "author": {
-    "email": "i@izs.me",
    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
    "url": "http://blog.izs.me/"
  },
  "bugs": {
@@ -67,12 +76,12 @@
  "main": "wrappy.js",
  "maintainers": [
    {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
    },
    {
-      "email": "kat@sykosomatic.org",
-      "name": "zkat"
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
    }
  ],
  "name": "wrappy",
--- a/node_modules/xmlbuilder/package.json
+++ b/node_modules/xmlbuilder/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "xmlbuilder@4.0.0",
-      "D:\\Cordova\\cordova-android\\node_modules\\plist"
+      {
+        "raw": "xmlbuilder@4.0.0",
+        "scope": null,
+        "escapedName": "xmlbuilder",
+        "name": "xmlbuilder",
+        "rawSpec": "4.0.0",
+        "spec": "4.0.0",
+        "type": "version"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\plist"
    ]
  ],
  "_from": "xmlbuilder@4.0.0",
@@ -11,16 +19,17 @@
  "_installable": true,
  "_location": "/xmlbuilder",
  "_npmUser": {
-    "email": "oozcitak@gmail.com",
-    "name": "oozcitak"
+    "name": "oozcitak",
+    "email": "oozcitak@gmail.com"
  },
  "_npmVersion": "1.4.28",
  "_phantomChildren": {},
  "_requested": {
-    "name": "xmlbuilder",
    "raw": "xmlbuilder@4.0.0",
-    "rawSpec": "4.0.0",
    "scope": null,
+    "escapedName": "xmlbuilder",
+    "name": "xmlbuilder",
+    "rawSpec": "4.0.0",
    "spec": "4.0.0",
    "type": "version"
  },
@@ -31,10 +40,10 @@
  "_shasum": "98b8f651ca30aa624036f127d11cc66dc7b907a3",
  "_shrinkwrap": null,
  "_spec": "xmlbuilder@4.0.0",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\plist",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\plist",
  "author": {
-    "email": "oozcitak@gmail.com",
-    "name": "Ozgur Ozcitak"
+    "name": "Ozgur Ozcitak",
+    "email": "oozcitak@gmail.com"
  },
  "bugs": {
    "url": "http://github.com/oozcitak/xmlbuilder-js/issues"
@@ -69,8 +78,8 @@
  "main": "./lib/index",
  "maintainers": [
    {
-      "email": "oozcitak@gmail.com",
-      "name": "oozcitak"
+      "name": "oozcitak",
+      "email": "oozcitak@gmail.com"
    }
  ],
  "name": "xmlbuilder",
--- a/node_modules/xmldom/package.json
+++ b/node_modules/xmldom/package.json
@@ -1,8 +1,16 @@
 {
  "_args": [
    [
-      "xmldom@0.1.x",
-      "D:\\Cordova\\cordova-android\\node_modules\\plist"
+      {
+        "raw": "xmldom@0.1.x",
+        "scope": null,
+        "escapedName": "xmldom",
+        "name": "xmldom",
+        "rawSpec": "0.1.x",
+        "spec": ">=0.1.0 <0.2.0",
+        "type": "range"
+      },
+      "d:\\cordova\\cordova-android\\node_modules\\plist"
    ]
  ],
  "_from": "xmldom@>=0.1.0 <0.2.0",
@@ -12,16 +20,17 @@
  "_location": "/xmldom",
  "_nodeVersion": "5.5.0",
  "_npmUser": {
-    "email": "jindw@xidea.org",
-    "name": "jindw"
+    "name": "jindw",
+    "email": "jindw@xidea.org"
  },
  "_npmVersion": "3.3.12",
  "_phantomChildren": {},
  "_requested": {
-    "name": "xmldom",
    "raw": "xmldom@0.1.x",
-    "rawSpec": "0.1.x",
    "scope": null,
+    "escapedName": "xmldom",
+    "name": "xmldom",
+    "rawSpec": "0.1.x",
    "spec": ">=0.1.0 <0.2.0",
    "type": "range"
  },
@@ -32,30 +41,30 @@
  "_shasum": "10de4e5e964981f03c8cc72fadc08d14b6c3aa26",
  "_shrinkwrap": null,
  "_spec": "xmldom@0.1.x",
-  "_where": "D:\\Cordova\\cordova-android\\node_modules\\plist",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\plist",
  "author": {
-    "email": "jindw@xidea.org",
    "name": "jindw",
+    "email": "jindw@xidea.org",
    "url": "http://www.xidea.org"
  },
  "bugs": {
-    "email": "jindw@xidea.org",
-    "url": "http://github.com/jindw/xmldom/issues"
+    "url": "http://github.com/jindw/xmldom/issues",
+    "email": "jindw@xidea.org"
  },
  "contributors": [
    {
-      "email": "yaronn01@gmail.com",
      "name": "Yaron Naveh",
+      "email": "yaronn01@gmail.com",
      "url": "http://webservices20.blogspot.com/"
    },
    {
-      "email": "amirjanyan@gmail.com",
      "name": "Harutyun Amirjanyan",
+      "email": "amirjanyan@gmail.com",
      "url": "https://github.com/nightwing"
    },
    {
-      "email": "alan@prettyrobots.com",
      "name": "Alan Gutierrez",
+      "email": "alan@prettyrobots.com",
      "url": "http://www.prettyrobots.com/"
    }
  ],
@@ -85,32 +94,32 @@
  ],
  "licenses": [
    {
-      "MIT": "http://opensource.org/licenses/MIT",
      "type": "LGPL",
-      "url": "http://www.gnu.org/licenses/lgpl.html"
+      "url": "http://www.gnu.org/licenses/lgpl.html",
+      "MIT": "http://opensource.org/licenses/MIT"
    }
  ],
  "main": "./dom-parser.js",
  "maintainers": [
    {
-      "email": "jindw@xidea.org",
-      "name": "jindw"
+      "name": "jindw",
+      "email": "jindw@xidea.org"
    },
    {
-      "email": "yaronn01@gmail.com",
-      "name": "yaron"
+      "name": "yaron",
+      "email": "yaronn01@gmail.com"
    },
    {
-      "email": "alan@prettyrobots.com",
-      "name": "bigeasy"
+      "name": "bigeasy",
+      "email": "alan@prettyrobots.com"
    },
    {
-      "email": "kethinov@gmail.com",
-      "name": "kethinov"
+      "name": "kethinov",
+      "email": "kethinov@gmail.com"
    },
    {
-      "email": "jinyun.jin@gmail.com",
-      "name": "jinjinyun"
+      "name": "jinjinyun",
+      "email": "jinyun.jin@gmail.com"
    }
  ],
  "name": "xmldom",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cordova-android",
-  "version": "5.2.0",
+  "version": "5.2.1",
  "description": "cordova-android release",
  "bin": {
    "create": "bin/create"
Author	SHA1	Message	Date
Vladimir Kotikov	35dfdece12	CB-11550 Updated RELEASENOTES for release 5.2.1	2016-07-11 13:43:57 +03:00
Vladimir Kotikov	cbed234069	CB-11550 Set VERSION to 5.2.1 (via coho)	2016-07-11 13:43:57 +03:00
Vladimir Kotikov	81b2bccd97	CB-11550 Update JS snapshot to version 5.2.1 (via coho)	2016-07-11 13:43:57 +03:00
Vladimir Kotikov	89a00c02a4	CB-11550 Updated and checked-in node_modules	2016-07-11 13:41:00 +03:00
Alexander Sorokin	40d3cdc0d6	CB-9489 Fixed "endless waiting for emulator" issue	2016-07-11 13:11:04 +03:00
Vivek Kiran	8416c4e5e9	CB-11481: android-library is deprecated use com.android.library instead	2016-07-11 13:11:03 +03:00
@@ -1 +1 @@
 .2.0
 .2.1