Merge branch 'urllogger'

Conflicts:
	GPSLogger/res/xml/settings.xml