Fix in filenames during bench log parsing
Fix for mid-solving clause adding
Merge branch 'master' into lazy-cnf

Conflicts:
	util/parselog.ml