Merge with Niek
Verification setting added

Merge branch 'MasterSimulation' of https://github.com/AgileManufacturing/HUniversal-Production-Utrecht into MasterSimulation

Conflicts:
	src/REXOS/MAS/simulation/util/Settings.java