Fixed bug in aggregate.
Changed cin with scanf on GringoNumericFormat.
Merge branch 'competition' of https://github.com/alviano/wasp into competition

Conflicts:
	src/input/GringoNumericFormat.cpp