CB-7219: initial work for cordova.js platformVersion
CB-7219 prepare-browserify now supports commitId and platformVersion for cordovajs
CB-7219 prepare-browserify computes commitId and platformVersion
CB-7576 Support 'windows' merges folder for Windows platform
CB-7578 Windows. Fix platform name reported by pre_package hook
Fix CB-7615 Read config.xml after pre-prepare hooks fire
Revert "Revert "Merge branch 'browserPlatform' of https://github.com/surajpindoria/cordova-lib""

This reverts commit a01779552ad240dc2e2a550376ce6e2978eeba8b.
bumped to 3.6.3
readded npm-shrinkwrap.json
CB-7383 Updated version and RELEASENOTES.md for release 0.21.13
set version to 0.21.14-dev
CB-7219: initial work for cordova.js platformVersion
CB-7219 prepare-browserify now supports commitId and platformVersion for cordovajs
Merge branch 'cb-7219' of https://git-wip-us.apache.org/repos/asf/cordova-lib into cb-7219
computeCommitId for browserify workflow fixed to handle cli and non cli workflows:q
removed console.logs
CB-7572 Serve - respond with 304 when resource not modified
Merge branch 'master' into cb-7219
CB-6481 Added unified hooks support for cordova app and plugins

* Hooks can be defined in .cordova/hooks/hook_type, hooks/hook_type directories, config.xml and plugins/.../plugin.xml
* Javascript hooks retrieved from config.xml and plugins/.../plugin.xml will be run via new module loader
* Introduced before_plugin_install, after_plugin_install and before_plugin_uninstall hooks
CB-6481 Updated hooks documentation