Changed phonegap version
removed stupid, deprecated, unsupported, undocumented, app-breaking default setting
Merge branch 'master' into database

Conflicts:
	ifiske-app/www/config.xml