reset
Merge https://github.com/friddle/LocationBaseNotification

Conflicts:
	.classpath
	bin/LocationBaseNotification.apk
	bin/classes.dex
	bin/classes/amethyst/friddle/Location/BaseActivity.class
	bin/classes/amethyst/friddle/Location/LocationService$1.class
	bin/classes/amethyst/friddle/Location/LocationService$LocalBinder.class
	bin/classes/amethyst/friddle/Location/LocationService.class
	bin/classes/amethyst/friddle/LocationItem/Constant.class
	bin/classes/amethyst/friddle/Provider/DataBaseHelper.class
	bin/classes/amethyst/friddle/Provider/DatabaseProvider.class
	bin/classes/amethyst/friddle/Provider/GeocodingProvider.class
	bin/classes/amethyst/friddle/Provider/LocationProvider$1.class
	bin/classes/amethyst/friddle/Provider/LocationProvider$State.class
	bin/classes/amethyst/friddle/Provider/LocationProvider.class
	bin/dexedLibs/android-support-v4-45b90a406a472d1216c942d1a339b84d.jar
	bin/resources.ap_
	src/amethyst/friddle/Location/BaseActivity.java
	src/amethyst/friddle/Location/LocationService.java
	src/amethyst/friddle/LocationItem/Constant.java
	src/amethyst/friddle/Provider/DatabaseProvider.java
	src/amethyst/friddle/Provider/GeocodingProvider.java
	src/amethyst/friddle/Provider/LocationProvider.java
update from older one