Merge branch 'mergeDeveloppment' of https://github.com/lufe089/VARIAMOS
into mergeDeveloppment

Conflicts:

	com.cfm.productline.solver/bin/com/cfm/productline/solver/SWIPrologSolver.class
Merge branch 'mergeDeveloppment' of https://github.com/lufe089/VARIAMOS into mergeDeveloppment