...
Merge branch 'master' of https://github.com/Data2Semantics/d2s-tools.git
Merge branch 'master' of https://github.com/Data2Semantics/d2s-tools.git
....
Merge branch 'master' of https://github.com/Data2Semantics/d2s-tools.git

Conflicts:
	kernelexperiments/src/main/java/org/data2semantics/exp/GeoCompareExperiment.java
Merge branch 'master' of https://github.com/Data2Semantics/d2s-tools.git
Merge branch 'master' of https://github.com/Data2Semantics/d2s-tools.git
update from X6