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

Conflicts:
	phenoscapeII/src/outputter/StateStatementParser.java
	phenoscapeII/src/outputter/Structure2Quality.java