minor cache change
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics

Conflicts:
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/Cache.java