Pre merge commit
Pre merge commit
Post merge commit
Merge branch 'master' of https://github.com/tonnrueter/RixsTool
Merge branch 'master' of https://github.com/tonnrueter/RixsTool
Changed imageView in mainTool to ImageMaskWidget
Introduced subclass RixsImageMaskWidget to ui
Created temporary distinction between different dev systems for the location of ui files