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

Conflicts:
	appcompat/bin/android-support-v7-appcompat.jar
	fuellogger_project/bin/classes.dex
	fuellogger_project/bin/classes/no/appfortress/fuellogger/R$styleable.class
	fuellogger_project/bin/resources.ap_
	google-play-services_lib/bin/google-play-services_lib.jar