merge
Merge branch 'dev' of https://github.com/arthurmagne/ComptaQuick into dev