More simplifications in deletion strategy.
Small clean of the code.
Add macros for assert with useful messages.
Merge branch 'master' of https://github.com/alviano/wasp

Conflicts:
	src/Solver.h