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

Conflicts:
	fuellogger_project/bin/R.txt
	fuellogger_project/bin/classes.dex
	fuellogger_project/bin/classes/no/appfortress/database/MySQLiteDatabase.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/MainActivity.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/MyFuelingsFragment.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/MyWidgetProvider.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/fuellogger/R$xml.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/RegisterFuelFragment$3.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/RegisterVehicleFragment.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/VehicleActivity.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/VehiclesFragment.class
	fuellogger_project/bin/classes/no/appfortress/gps/MyGoogleMaps.class
	fuellogger_project/bin/resources.ap_
	fuellogger_project/gen/no/appfortress/fuellogger/R.java