Preparation pipedMediator
Merge branch 'master' of https://github.com/jmarginier/simulator.git

Conflicts:
	gui-simulator/src/main/java/fr/ensicaen/gui_simulator/gui/panel/SimulatorPanel.java
	simulator/src/main/java/fr/ensicaen/simulator/simulator/Context.java