chkpoint
Entre2
Merge remote-tracking branch 'origin/4Interface' into 4Interface

Conflicts:
	CarnozetApps/GitApps/Live_conduite vaise Project/Presets/MIDI Effects/Max MIDI Effect/midi2VideoEffets.amxd
OK
Merge remote-tracking branch 'origin/4Interface' into 4Interface
correct ball manager
lala