ignore changes
Merge branch 'dev' of https://github.com/phenoscape/phenoscape-nlp.git
into dev

Conflicts:
	phenoscapeII/src/outputter/ELKReasoner.java
Fixed exceptions and added the missing codes