added a token-based filter of semantic annotation
Merge remote-tracking branch 'origin/master'

Conflicts:
	txtfnnl-uima/src/main/java/txtfnnl/uima/analysis_component/TokenBasedSemanticAnnotationFilter.java