Extended evaluation and minor changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvaluateSpotlightModel.scala