Merge branch 'devel'

docs/en/calculators/pam/bloc_base_carree.png

docs/en/calculators/pam/bloc_cylindre.png

docs/en/calculators/pam/bloc_face_arrondie.png

docs/en/calculators/pam/bloc_face_plate.png

docs/en/calculators/pam/macrorugo_theorie.md

docs/fr/calculators/pam/bloc_base_carree.png

docs/fr/calculators/pam/bloc_cylindre.png

docs/fr/calculators/pam/bloc_face_arrondie.png

docs/fr/calculators/pam/bloc_face_plate.png

docs/fr/calculators/pam/macrorugo_theorie.md

jalhyd_branch