Merge branch 'master' of https://github.com/stephenwyatt/phonegap-start

Conflicts:
	www/config.xml
d