Merge branch 'AJS_gps_proximity_method_2' into AJS_dev

Conflicts:
	src/com/kab/wherefi/service/DataService.java