reso bug syncro
Merge branch 'master' of https://github.com/xefiry/NaoM1Patia