cache now builds seperate files in history subdirectory for each es query
added a load method to cache
cache now accesses json strings properly
cache changes
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics

Conflicts:
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/CommentSearch.java
preparing merge
Merge branch 'matt'

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