Bilateral entity related changes
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	phenoscapeII/src/outputter/ELKReasoner.java