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

Conflicts:
	gs-cache/src/main/java/org/genericsystem/cache/Cache.java