changement inventory

Ch
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ViewPkg/MasterUI.java
Changement inventaire et question chamou
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Changement question chaman,

ch