Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Fixing merge conflicts from not updating VERSION
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Set VERSION to 2.9.0rc1
Merge branch '2.9.x' of https://git-wip-us.apache.org/repos/asf/cordova-js into 2.9.x
Testing non-xhr loader with Fil
more robust error handling.
Combine XHR + script injection technqieues to load the plugins list (either .json or .js file).
moved plugin loader script injection to a function so it can also be called when xhr fails just because the json file is not present.
Merge branch '2.9.x' of https://git-wip-us.apache.org/repos/asf/cordova-js into 2.9.x
[all] CB-3960 Convert Jakefile -> Gruntfile.js

Moves over all tasks except jshint. Our jshint options need updating to
work well with grunt.
[CB-3834] Missing double quotes in iOS deprecation notice
Merge branch '2.9.x' of https://git-wip-us.apache.org/repos/asf/cordova-js into 2.9.x
Fixing grunt file with Jarrod's help
Updating version file
[All] [CB-3941] [CB-3940] packaging was failing if pkg existed but pkg/debug did not.  Fixed whitespace difference between build platforms
(cherry picked from commit af24bb7d196b141ee6838776da346472835921f1)
Move computing of commit ID into packager.js
(cherry picked from commit 232f389252c94d3f7b5404ccb8c4b96fcf5467fa)
[all] CB-3960 Move jshint into grunt (lamely)
(cherry picked from commit 3d81324b9d89c8f51b14e2152eec5bfbea094caa)
Change jake reference in code comments to say "grunt"
(cherry picked from commit 3a9b99a4992b9c92a481006c29a58185cd50e056)