still working
Merge branch 'dev'

Conflicts:
	src/main/java/edu/arizona/biosemantics/semanticmarkup/config/RunConfig.java