scanner updates
Merge branch 'master' of https://github.com/ericgibert/supersid

edit scanner on both PC
Merge branch 'master' of https://github.com/ericgibert/supersid

from RasPi merge