Conflict resolve
Merge branch 'master' into overlay_refactor
gui: integrated a change in the overlay.py module into the new overlay/world.py one
Merge branch 'master' into overlay_refactor
gui: Overlay refacotring complete
Merge branch 'master' into overlay_refactor
Merge branch 'master' into overlay_refactor
gui: Polar overlay improvements and fixes
gui: Fixed ROA missing size label
Merge branch 'overlay_refactor'
driver semcomedi: workaround better DAQ board not accepting writes 1 scan

canceling after the write doesn't work as intended because the signal is reset (to 0).

so now, we detect this case and write directly the data (forever).

Fixes double spots in spot mode.
Merge branch 'master' of vpn.delmic.com:odemis