ignore IntelliJ files
moveFile handles absolute paths by not pre-pending anything to them
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'