Commit before merge

Changed loading configuration for equiplets, (partial)
mas communication diagram
receiving message based on reply with, or conversation ids
Merge remote-tracking branch 'origin/MasterSimulation' into MasterSimulation

Conflicts:
	src/REXOS/MAS/simulation/mas/product/ScheduleBehaviour.java
Merge branch 'MasterSimulation' of https://github.com/AgileManufacturing/HUniversal-Production-Utrecht into MasterSimulation

Conflicts:
	src/REXOS/MAS/simulation/graphics/SimInterface.java
	src/REXOS/MAS/simulation/mas/product/ProductListenerBehaviour.java
	src/REXOS/MAS/simulation/mas/product/ScheduleBehaviour.java
	src/REXOS/MAS/simulation/simulation/Simulation.java