merge
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
Merge remote-tracking branch 'origin/erik' into dev
unstable commit
Merge
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
Fix a deep issue in inheritance computer
Merge remote-tracking branch 'origin/erik' into dev
fix
Fix cache multimaps
Fix getRootDirectories
Change InheritanceComputer visibility to package
Change addSubNode to addNode
clean
Merge branch 'dev' of
https://github.com/genericsystem/genericsystem2014.git into dev

Conflicts:
	gs-kernel/src/test/java/org/genericsystem/kernel/PersistenceTest.java
fix equiv for Tree
Change equiv
remove throwExistException
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
Remove comment