Merge branch 'oss-release' of github.com:hltcoe/concrete
Merge branch 'master' of github.com:hltcoe/concrete
Move to parameterized logging statements
updated pred-arg linking structures
Merge branch 'master' of github.com:hltcoe/concrete
added prototype of how to add Discourse-level Entities and Situation

about to revise
updated Discourse(Entity|Event) definitions

going to try them out in parma to see if they are sufficient
added Discourse Entities and Situations, changed some field names
fixed concrete-protobuf compatibility bug
Proposal only - Breaking Changes

- added support for typed labeled attributes on vertices (for Slinky)
- added support for artbitrary attribute labels with values on
  attributes (for Jay)
Removed typing on LabeledAttribute per discussion with Ben.
Updated to use new LabeledAttribute
updated pom to fix dist issue
Merge branch 'master' of github.com:hltcoe/concrete
Added Duration and Set TimeML Timex types to Entities, and TimeML Event Class, Tense, and Aspect to Situations
Fixed TimeML situation duplicate enum values
Merge branch 'master' of github.com:hltcoe/concrete
Update gitignore to ignore .iml files; killed .iml file; remove parent from pom.xml
Merge pull request #14 from forkunited/master

Extended Entities and Situations to represent TimeML Events and Timexes
Situations now point to (rather than embed) a SituationMention

to mirror the behavior of Entity, EntityMention, and EntityMentionSet
(*MentionSet embeds the *Mentions and the *s point to those *Mentions)