update
Merge branch 'master' of https://github.com/codletech/testPhoneGap

Conflicts:
	testApp/www/core/data.dcaf