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

Conflicts:
	gs-cache/src/main/java/org/genericsystem/cache/Generic.java
	gs-cache/src/main/java/org/genericsystem/cache/GenericService.java
	gs-kernel/src/main/java/org/genericsystem/kernel/services/BindingService.java
getInstance error