更新
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/www/jquery.html
	bin/org.apache.cordova.example.cordovaExample.apk
	bin/resources.ap_
更新