fixes issue with open-image-tool-button + solves conflicts
Merge branch 'master' of https://github.com/digsc/mom-ca