Espin staff from LT3, Anais
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/bell/sweep_Bell.py
	scripts/espin/calibrations/standard_espin_calibrations.py
	scripts/espin/calibrations/standard_espin_calibrations_v2.py
- Conflicts resolved. Anais