updating package.json
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Revert "Merge branch 'browserify'"

This reverts commit 9c165de7ca85addd61434888213107558c31221a, reversing
changes made to 68ab22d1c2ecbcc608fe9d3d6d2b207cd40ef139.
Revert "Revert "Merge branch 'master' into browserify""

This reverts commit 68ab22d1c2ecbcc608fe9d3d6d2b207cd40ef139.

Conflicts:
	package.json
fixing jshint ident
updating version