Yeah
Merge branch 'master' of https://github.com/thordang/phonegap

Conflicts:
	www/config.xml
Yeah 3