Merge branch 'oss-release' of github.com:hltcoe/concrete
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
Added travis CI support
added two JDKs to travis.yml
Added protobuf 2.5.0 support to travis; updated README with status
fix travis.yml... hopefully