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/CarDBHandler.class
	fuellogger_project/bin/classes/no/appfortress/database/RefillDBHandler.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/DatabaseActivity.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/MainActivity.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/MyVehiclesFragment$1.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/MyVehiclesFragment.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$id.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$layout.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/RegisterVehicleFragment.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/VehiclesFragment.class
	fuellogger_project/bin/resources.ap_
	fuellogger_project/gen/no/appfortress/fuellogger/R.java
	fuellogger_project/src/no/appfortress/fuellogger/MyVehiclesFragment.java