commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes/model/IStrategy.class
	classes/model/OptionData.class
	classes/model/Room.class
	classes/view/IHM_Options$1.class
	classes/view/IHM_Options$2.class
	classes/view/IHM_Options$3.class
	classes/view/IHM_Options$4.class
	classes/view/IHM_Options$5.class
	classes/view/IHM_Options$6.class
	classes/view/IHM_Options$7.class
	classes/view/IHM_Options$8.class
	classes/view/IHM_Options.class