Updates from Edinburgh
Merge branch 'develop' of https://github.com/ruimiguelforte/unsupervised-srl into develop

Conflicts:
	target/classes/com/forte/conll/ConllToken.class