rettet en feil
Merge branch 'pre-alpha' of https://github.com/davidhel/FuelLogger into pre-alpha

Conflicts:
	fuellogger_project/bin/R.txt
	fuellogger_project/bin/classes/no/appfortress/fuellogger/GPSActivity.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/MainActivity.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$drawable.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$id.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$integer.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$layout.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$menu.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$string.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$style.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$styleable.class
	fuellogger_project/bin/classes/no/appfortress/gps/GPSTrackService.class
	fuellogger_project/gen/no/appfortress/fuellogger/R.java
	fuellogger_project/src/no/appfortress/gps/GPSTrackService.java