CB-6491 add CONTRIBUTING.md
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
CB-6587:Set Vesion to 3.6.0-dev
Upleveled changes from android.
updating version
Upleveled changes from android.
Disable urlutil tests under jsdom & set jsdom to file: to avoid hitting network
Fix broken unit tests with node v0.11.13+ (hack)
Changed id to amazon-fireos.
moving to TreeTransformer and adding a quick substitution for Android navigator.app clobber
updating version
[Doing-389]Merge Cordova/master(e009fd2adea6d189e)