bug fix in NonOntologyBasedStandardizer
no change
Merge branch 'master' into dev
Merge branch 'master' into dev
fixed a bug in isEntity and getEntityType
Merge branch 'dev'

Conflicts:
	src/main/java/edu/arizona/biosemantics/semanticmarkup/know/lib/LearnedCharacterKnowledgeBase.java
Merge branch 'master' of https://github.com/biosemantics/charaparser.git

Conflicts:
	src/main/java/edu/arizona/biosemantics/semanticmarkup/markupelement/description/transform/OntologyMappingTreatmentTransformer.java