more stuff
try now

Conflicts:
	my-app/platforms/ios/www/index.html