maj camera (reglage + collision)
Merge remote-tracking branch 'origin/master' into Monia