Pre-merge
Merge branch 'master' of
https://github.com/pascalgui/GestionDeCartesDeCommunication.git

Conflicts:
	src/gui/AboutPanel.java
	src/gui/WelcomePanel.java
	src/gui/components/JLabelLink.java