things
Merge branch 'working' of https://github.com/CrossIan/GeoBook into working

Conflicts:
	res/layout/cache.xml