fix error test in progress
Merge branch 'dev' of
https://github.com/genericsystem/genericsystem2014.git into dev

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