fix for #310
Merge remote-tracking branch 'remotes/upstream/develop' into develop
fix for #308 and #306 + a small fix for the QM edit button(icons was cropped)
fix for #305
Merge pull request #312 from Cipa/develop

fix for #308 and #306 + small icon fix