Ok
Merge branch 'master' of https://github.com/Noobsaure/ProjetCroixRouge

Conflicts:
	map/src/views/listeners/FinDePriseEnChargeButtonListener.java
Merge branch 'master' of https://github.com/Noobsaure/ProjetCroixRouge