Merge origin/master

Conflicts:
	SimulationCapitaineriePort/src/presentation/IHM.java
Merge origin/master