change
Merge branch 'master' of github.com:Villard-David/WorkIHM

Conflicts:
	VITIPI_setup/src/menu/complet/ToolBar.java