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.
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'