My Comments button goes to my comments page
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
Updated UML
DO NOT MERGE THIS!! There is some commented out stuff in the model. added
saving to a file but the serialization is having errors relating to references
in the model creating infinite recursion.
Fixed photo imageview bug
added a GraphAdapterBuilder class from google so that Gson can serialize
circular references in our model. Also the history cache now saves when a new
comment is made
Merge branch 'matt'
commit prior to pull
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
merge demons: "I want to pull master. Give me master."
Still a serialization error. Fixed crashing so that master works again.
renamed service. switching back to branch.
forgot new named file.
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
merge
Added a comment controller and migrated some code to it