commit parce que chuis oblig�
Merge branch 'master' of https://github.com/mi-black/clubjdr

Conflicts:
	build/classes/net/display/ParametreDisplay.class