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

Conflicts:
	appcompat/bin/android-support-v7-appcompat.jar
	fuellogger_project/bin/R.txt
	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$2.class
	fuellogger_project/bin/classes/no/appfortress/fuellogger/MyVehiclesFragment$LongClickCarDialog.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/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/VehiclesFragment.class
	fuellogger_project/gen/no/appfortress/fuellogger/R.java
	fuellogger_project/src/no/appfortress/fuellogger/MyVehiclesFragment.java
	google-play-services_lib/bin/google-play-services_lib.jar