Fix to fact that shift is used in masking and cannot change tool type.
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git