nothing
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
nothing
Merge branch 'master' of
https://github.com/genericsystem/genericsystem2011.git

Conflicts:
	genericsystem-myadmin/src/test/java/org/genericsystem/test/AbstractTest.java
implements check consistency
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git