cambios 5
Merge branch 'master' of https://github.com/trololo1test/phonegap-start

Conflicts:
	www/.DS_Store