From LT1, Anais
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/espin/calibrations/standard_espin_calibrations_v2.py