Merge branch 'master' into browserPlatform
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-7383 Incremented package version to -dev
Updated wp8 to not use a subdir and moved to 3.6.1
CB-7383 Bump the platform version numbers to 3.6.1
CB-7509 Revert back subdirectory for wp8

This is necessary since 'cordova platform add wp8' with --usegit option fails due to invalid path to create script.
Update browser platform version
Merge branch 'browserPlatform' of https://github.com/surajpindoria/cordova-lib
Fixed issue in cordova-browser, need to update the version
Merge branch 'browserPlatform' of https://github.com/surajpindoria/cordova-lib
CB-7518 Don't run "android update lib-project" for android 3.6.0

It's no longer required.
Removed unnecessary manifest creation from browser_parser
Added tests for browser platform
Merge branch 'browserPlatform' of https://github.com/surajpindoria/cordova-lib
Revert "Merge branch 'browserPlatform' of https://github.com/surajpindoria/cordova-lib"

This reverts commit 405d0da0fc8ba1598192b7ef212854b9d7542bf8, reversing
changes made to ace7e33531e3dce2ac84038ca4c76fb4cfc4657f.
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