fixed bug with pregrouping
Merge remote-tracking branch 'refs/remotes/upstream/master' into distributed-testrunner

Conflicts:
	main.py
allocator for output of simulator; assigns processors to jobs