Merge with branch master ...

diff --combined src/ASTTransform/integerencoding.cc
index a992f8f72b06c0ec53a8f61dea704f51961cfca0,a3262330f238519514fefbdc8a86b3c045e16e9d..ff384cbb67bb451d8023c051befaa0560a88bf72
--- 1/src/ASTTransform/integerencoding.cc
--- 2/src/ASTTransform/integerencoding.cc
+++ b/src/ASTTransform/integerencoding.cc
@@@ -5,8 -5,7 +5,9 @@@
  #include "csolver.h"
  #include "predicate.h"
  #include "element.h"
 +#include "rewriter.h"
 +
+ /*
  void orderIntegerEncodingSATEncoder(SATEncoder *This, BooleanOrder *boolOrder){
        Order* order = boolOrder->order;
        if (order->elementTable == NULL) {
@@@ -26,7 -25,6 +27,7 @@@
                This->solver->allElements.push(elem2);
                This->solver->constraints.add(boolean);
        }
 +      replaceBooleanWithBoolean(This->solver, boolOrder, boolean);
  }
  
  
@@@ -41,3 -39,4 +42,4 @@@ Element* getOrderIntegerElement(SATEnco
                return eset->get(&oelement)->elem;
  }
  
+ */