temp.
Merge branch 'suppl' of
https://github.com/hugolapointe/ShapesClientsApplication

Conflicts:
	bin/MainForm.class
	bin/MenuBar.class
	bin/ShapesContainer.class
	src/MainForm.java
	src/MenuBar.java
Merge branch 'master' of https://github.com/hugolapointe/FormesClient into suppl

Conflicts:
	bin/SequencesClient$1.class
	bin/prefs.properties
	src/LocalisationResource.java
	src/MenuBar.java
	src/SequencesClient.java
	src/prefs.properties