Merge branch 'master' of https://github.com/hunterhector/EvmEval

Conflicts:
	.gitignore
	LICENSE/README
	brat2tokenFormat.py
	doc/Event-Mention-Detection-scoring-v15.docx
	package/LICENSE/README
	package/README.md
	scorer.py
something
Merge branch 'master' of https://github.com/hunterhector/EvmEval