change root layout to overlap video and webview
Merge branch 'master' into sticky
allows to override loadUrlNow
specify cordovaInterface
make sendJavascript public
Merge branch 'master' of https://github.com/apache/incubator-cordova-android into sticky
Merge branch 'master' into sticky
disable plugins loading
fix jscript error
add more info to trace
fix setup
Merge branch 'master' into sticky

Conflicts:
	framework/project.properties
	framework/src/org/apache/cordova/api/LegacyContext.java
merge with official 2.2.0