hum espère
Merge branch 'master' of https://github.com/mensonge/mensonge

Conflicts:
	src/main/java/mensonge/userinterface/SliderWithMarkers.java