Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
app.nlp.parse: Removing DepParser1, renaming DepParser2 to DepParser1
app.nlp.coref: Removing WithinDocCoref1, renaming WithinDocCoref2 to WithinDocCoref1
app.nlp.parse: renaming
Merge pull request #20 from alextp/samplerank

optimize: fixing SampleRankExample to work in the case when there is more than one proposal with the best objective score
switched order of options handling in coref to account for a test time opt that's safe to override what the model file specified
Merge branch 'master' of https://github.com/factorie/factorie into entity-type-changes
nlp: merging the pull request which deletes parser1 and coref1
changing a few stray DepParser2 references in comments and in the QSubExecutor for the parser trainer
update to released factorie models
update CHANGELOG in preparation of release
[maven-release-plugin] prepare release factorie-1.0.0-M6
[maven-release-plugin] prepare for next development iteration
app.nlp: adding functionality to DocumentAnnotatorMap to actually compute annotations
app.nlp: removing process() functionality from DocumentAnnotator and using the one in the annotator map
app.nlp: fix doc/document bug
DepParser1: Fix 2->1 in deserialization message.
ConllCorefLoader: Add TODO.
TODO: Update list.