Fix addInstance / setInstance
Merge remote-tracking branch 'origin/dev' into erik

Conflicts:
	gs-kernel/src/test/java/org/genericsystem/kernel/AdjustMetaTest.java
	gs-kernel/src/test/java/org/genericsystem/kernel/SingularConstraintTest.java