undo incorrect performance improvement
Merge branch 'master' into ps

Conflicts:
	src/ClaspSolver.cpp
optimizing propagate conversion clasp -> hex
making singleton loop nogood optimization deactivateable (compile time)
only dumping program if we also display it
making benchmarks suspendable (as already used in multithreaded solver, but now it is not counted twice)
small benchmark name adjustments
building clasp and gringo with -fPIC (necessary to put them into a shared library)
replacing gringo "app" option handling by simplified option handling that does not require gringo libprogram_opts

(because we need clasp libprogram_opts and they use different incompatible versions in the same namespace)
logging bug fix
using clasp configuration parsers to configure clasp solver
better benchmarking suspension
two comments about thread deactivation
making clasp configuration more complete, "none" deactivates it
making clasp configuration more complete, "none" deactivates it deactivated SatElite which makes result incorrect
fixing bug: endInit may return that program is initially inconsistent