Fix tokenspan bug.
Merge branch 'master' of https://github.com/factorie/factorie

Conflicts:
	src/main/scala/cc/factorie/app/nlp/relation/PatternBasedRelationFinder.scala