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

Conflicts:
	genericsystem-impl/src/main/java/org/genericsystem/core/GenericImpl.java
	genericsystem-impl/src/main/java/org/genericsystem/systemproperties/constraints/simple/UniqueStructuralValueConstraintImpl.java
	genericsystem-impl/src/main/java/org/genericsystem/systemproperties/constraints/simple/UniqueValueConstraintImpl.java
	genericsystem-myadmin/src/main/java/org/genericsystem/myadmin/beans/GenericBean.java
	genericsystem-myadmin/src/main/java/org/genericsystem/myadmin/beans/GenericTreeBean.java
	genericsystem-myadmin/src/main/java/org/genericsystem/myadmin/beans/GenericTreeNode.java
	genericsystem-myadmin/src/main/java/org/genericsystem/myadmin/beans/MapProviderBean.java
	genericsystem-myadmin/src/main/webapp/pages/typesmanager/edit.xhtml
	genericsystem-myadmin/src/main/webapp/pages/typesmanager/menu.xhtml
	genericsystem-myadmin/src/main/webapp/pages/typesmanager/tree.xhtml
merge
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
persistence du homeTree
Merge branch 'master' of
https://github.com/genericsystem/genericsystem2011.git

Conflicts:
	genericsystem-impl/src/main/java/org/genericsystem/core/CacheImpl.java
	genericsystem-impl/src/main/java/org/genericsystem/core/HomeTreeNode.java
	genericsystem-impl/src/main/java/org/genericsystem/map/ConstraintsMapProvider.java
	genericsystem-impl/src/main/java/org/genericsystem/systemproperties/constraints/simple/UnduplicateBindingConstraintImpl.java
	genericsystem-impl/src/main/java/org/genericsystem/systemproperties/constraints/simple/UniqueValueConstraintImpl.java
Merge branch 'master' of
https://github.com/genericsystem/genericsystem2011.git

Conflicts:
	genericsystem-impl/src/main/java/org/genericsystem/map/ConstraintsMapProvider.java
	genericsystem-impl/src/main/java/org/genericsystem/systemproperties/constraints/InstanceClassConstraintImpl.java
	genericsystem-impl/src/main/java/org/genericsystem/systemproperties/constraints/SizeConstraintImpl.java
Archiver