Merge branch 'master' of git://github.com/sintaxi/phonegap Conflicts: android/src/com/android/droidgap/DroidGap.java