rework pref screen a bit
fix ffvl server preset
Merge branch 'master' of git://github.com/Peter2121/gpslogger

Conflicts:
	GPSLogger/res/xml/livetrack24settings.xml
	GPSLogger/res/xml/settings.xml
	GPSLogger/src/com/mendhak/gpslogger/common/Utilities.java
reindent settings + bump version