latest changes during the yellow/gate experiments and installation of the new wavemeter.
Merge branch 'master' of github.com:wpfff/qtlab-user-diamond-master

Conflicts:
	lib/measurement2/adwin_ssro/ssro.py