Merge remote-tracking branch 'origin/learning' into bobot/for_master

Conflicts:
	src_colibri2/core/demon.ml
	src_colibri2/core/egraph.ml
	src_colibri2/core/egraph.mli
	src_colibri2/core/ground.ml
	src_colibri2/core/ground.mli
	src_colibri2/solver/scheduler.ml
	src_colibri2/theories/ADT/adt.ml
	src_colibri2/theories/bool/boolean.ml
	src_colibri2/theories/bool/equality.ml