Piece future ok
Merge origin/master

Conflicts:
	src/view/FenetrePrincipale.java