Roi clean up develop

Mainly clean up
To check in measurement tool:
 * If the action associated to a button is to open a new window, the text displayed should be ```XXX...``` e.g. ```Save...```
 * Check that ```colour``` has been replaced by ```color```

--rebased-from #2666