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

Conflicts:
	appcompat/bin/android-support-v7-appcompat.jar
	fuellogger_project/AndroidManifest.xml
	fuellogger_project/bin/AndroidManifest.xml
	fuellogger_project/bin/Fuellogger.apk
	fuellogger_project/bin/dexedLibs/achartengine-1.1.0-0b3f59e7c2c2ba368956b24b54c21dae.jar
	fuellogger_project/bin/dexedLibs/android-support-v4-718a8a96a952487621017a47b9faa440.jar
	fuellogger_project/bin/dexedLibs/android-support-v7-appcompat-ee194f084017a7ec4dc26bca6e40e8c3.jar
	fuellogger_project/bin/dexedLibs/android-support-v7-appcompat-eec870cbb37406b7db620fb695d87b17.jar
	fuellogger_project/bin/dexedLibs/google-play-services-bdcfa84030688a9bab095e762218ebe2.jar
	fuellogger_project/bin/dexedLibs/google-play-services_lib-fb8b15c5c64fe0ee6e1955c1ff5e84c4.jar
	fuellogger_project/bin/resources.ap_
	google-play-services_lib/bin/google-play-services_lib.jar