merge
Merge branch 'dev' of
https://github.com/genericsystem/genericsystem2014.git into dev

Conflicts:
	gs-kernel/src/test/java/org/genericsystem/kernel/PropertyConstraintTest.java
implement propertyConstraint, GetInstanceConstraint