Up to date structure
working on testing the sorts
merged new branch
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
added test for getCommentsWithinRegion (finished)
Merge branch 'twendlan'
added description to test
fixed conflict classpath
didn't have jest jar in the build path
Added TLComment Test
Edit Comment now works
Created testcase for Editing
Working on basic screen for StartActivity
edited UML
edited stuff
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