finished test for SortCommentsByDate
adding sort functionality for both TLC and Replies, still needs more testing
added SortCommentsByFreshness still draft phase, starting testing
finished testSortAllCommentsByProximity
added test stubs for the rest
edited UML
edited stuff
Fixing the layouts again, split into multiple activities
added ES id fields in CommentModel. Worked on "return values" for some
services.
Merge branch 'james'

Conflicts:
	GeoTopicsActivity/res/layout/activity_geo_topics.xml
	GeoTopicsActivity/res/values/strings.xml
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/BrowseActivity.java
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/GeoTopicsApplication.java
Fixed a missed merge
Merge branch 'slmyers'
mergeing commentmodel changes and geoapplication changes.
Conflicts:
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/CommentModel.java
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/GeoTopicsApplication.java
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
merging changes to CommentModel and GeoTopicsApplication
finished testing for SortTLCByPicture
removed broadcast reciever from BrowseActivity. Don't remember making
change to GeoTopicsApplication, but commit seems to imply I did.
File looks the same too w/e.
finished testing for SortRepliesByPicture
Fixed a small issue with the start activity
More bug fixes
Changed the GeoTopics constructor a bit
finished tests for sorting, save for sortByScoringSystem