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

Conflicts:
	src/gui/FamilyPanel.java
Paths, executables and library updated

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

Conflicts:
	src/gui/FamilyPanel.java