Fix bug in SatSolver +  simplification of SatFactory
Merge branch 'feature-clause' into develop