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

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