Merge branch 'master' of https://github.com/Frank112/BP38Ergonomie

Conflicts:
view/view.pri