Preparing to tag 2.5.0
Merge branch 'next'
[CB-861] Header support for FileTransfer download

Added support for an optional options object as the final arg. Currently only handles the options.headers object (as per the issue).

`FileTransfer.download(source, target, successCallback, errorCallback, trustAllHosts, options)`

This is needed for using FileTransfer.download with Basic Authentication, etc. Sadly since Android 2.x doesn't support XHR2, this is needed in FileTransfer.

I have only added support to Android and iOS (see other PR's).
ignore IntelliJ files
moveFile handles absolute paths by not pre-pending anything to them
CB-2596: Fixing the menubutton for text fields
Add readAsBinaryString and readAsArrayBuffer support
CB-2198: Removing option to use our broken URL stack as a history as per deprecation policy.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
CB-2623 Adding update script to Android
CB-2623: Added partial work on update script
CB-2623: Updated windows script, now it works here too for once
Allow plugins to capture shouldInterceptRequest()
CB-2099: Android Whitelisting now blocks images and JS with an empty response
Making framework only apply for http resources for now, so we don't break non-http handling
Making framework only apply for http resources for now, so we don't break non-http handling.  I had to squash this to make it pretty
So much for squashing, I should have branched this.
Removing baseURL because it doesn't actually do anything.  If we want to make sure remote websites work, we whitelist them
Merge branch 'master' of git://github.com/sweetleon/cordova-android into leon
Merge branches 'leon' and 'master'