modified Makefiles to include GeoLocation dependencies
merged changes