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

Conflicts:
	genericsystem-kernel/src/main/java/org/genericsystem/kernel/services/CompositesInheritanceService.java