second version (an intermediate one)
Merge branch 'master' of https://github.com/streamreasoning/cpsm4mdw14

Conflicts:
	log/debug.log
	src/main/java/org/citydatafusion/cpsma/cpsma4mdw2014/StubBasedCPSMA.java

resolved using mine