Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/GUI/PanelPartie.class
	src/GUI/PanelPartie.java