Merge branch 'develop' into Antoine
Merge branch 'develop' into Kevin
modif classes
Modify access modifiers
Merge remote-tracking branch 'origin/Kevin' into Antoine
Merge branch 'Antoine' into develop