Crules as aggregates.
Merge branch 'competition' of https://github.com/alviano/wasp into competition

Conflicts:
	src/Aggregate.cpp
Crule as aggregates.