Un vrai message
Merge branch 'master' of https://github.com/Noobsaure/ProjetCroixRouge

Conflicts:
	map/src/views/AddLocationPanel.java
	map/src/views/MapPanel.java
	map/src/views/listeners/MapPanelMouseListener.java