adapted evaluation relevant classes (source/sentence mapping)
commit to resolve git conflict
resolve git conflict
Merge branch 'master' of https://github.com/biosemantics/charaparser.git

Conflicts:
	src/semanticMarkup/run/MarkupDBSentencesForEvalautionRun.java