JC
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	lib/measurement2/adwin_ssro/dynamicaldecoupling.py