adding code to save cache straight from elasticsearch pull
added the cache singleton to the commentsearch class
commit
minor cache modification
Merge branch 'master' into matt
getting ready to merge
cache now builds seperate files in history subdirectory for each es query
fixed freshness sort
Merge branch 'james'
added a load method to cache
Adding a new mockup to attend to josh's feedback
Merge branch 'twendlan'
freshness sort algorithm updated / fixed tests
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
Removed SortByScoringSystem
Updated UML
cache now accesses json strings properly
Updated UML, Removed Scoring System Sort
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics

Conflicts:
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/BrowseActivity.java
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/CommentListModel.java
Fixed up merge mess. Nothing new.