Merge branch 'OOP' of https://scm.cri.ensmp.fr/git/Faustine into OOP