Use colormap from the dialog and not always the default.
Move MaskImageTools
Merge remote-tracking branch 'upstream/master'