edit new form
commit
Merge branch 'master' of https://github.com/louisfourrier/toucan
conflicts between master and settings branches