finish
Merge remote-tracking branch 'origin/master'

Conflicts:
	discolog/java/fr/limsi/discolog/PlanConstructor.java
	discolog/prolog/test-2p/Domain_knowledge.pl
commeting changes