merge test
Merge branch 'master' of https://github.com/mtadmk/Miss.git

Conflicts:
	SystemControllerSim/src/pl/agh/miss/SimulatedController.java