Merge remote-tracking branch 'origin/master'

Conflicts:
	out/production/dev/gpi/MainApp.class

Merge remote-tracking branch
'origin/master'

Conflicts:
	out/production/dev/gpi/MainApp.class

Ajout
d'un borderpane
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 7e4c918d660b6aeaeb243b639f6f1621a9879787.