mark as merged
Merge branch 'master' of
https://github.com/genericsystem/genericsystem2011.git

Conflicts:
	genericsystem-impl/src/main/java/org/genericsystem/impl/core/EngineImpl.java