some minor changes
Merge branch 'master' of github.com:carpe-noctem-cassel/supplementary

Conflicts:
	constraintsolver/src/CGSolver.cpp
Merge branch 'master' of github.com:carpe-noctem-cassel/supplementary
Merge branch 'master' of github.com:carpe-noctem-cassel/supplementary
implemented CNSat and CNSMTGSolver + some minor fixes