correction conflits
Merge branch 'master' of https://github.com/AnKaRobot/robot
normalisation photos ; divers corrections detect3