Merge branch 'master' into 4.0.x (bindButton changes)

Conflicts:
	framework/src/org/apache/cordova/CordovaWebView.java
	package.json

package.json

@@ -12,11 +12,18 @@
     "cordova",
     "apache"
   ],
+  "scripts": {
+    "test": "jasmine-node --color spec"
+  },
   "author": "Apache Software Foundation",
   "license": "Apache version 2.0",
   "dependencies": {
     "q": "^0.9.0",
     "shelljs": "^0.2.6",
     "which": "^1.0.5"
+  },
+  "devDependencies": {
+    "jasmine-node": "~1",
+    "promise-matchers": "~0"
   }
 }