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

Conflicts:
	fuellogger_project/bin/classes.dex
	fuellogger_project/bin/classes/no/appfortress/fuellogger/RegisterFuelFragment.class