my location & adding found caches
Merge branch 'working' of https://github.com/CrossIan/GeoBook/ into
working

Conflicts:
	src/com/cse/geobook/Map.java
map & data
Merge remote-tracking branch 'origin/working' into working

Conflicts:
	project.properties