conflit
Merge branch 'master' of https://github.com/hysst/cofp1.git
linked "effacer" button in "trame modification"