Merge branch 'master' of https://github.com/DaveRand/phonegap-workshop-master

Conflicts:
	config.xml