commit to sync init changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	discolog/java/fr/limsi/discolog/PlanConstructor.java