bas
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	scripts/magnetometry/magnetometry_calibration.py
	scripts/magnetometry/old_analysis_adptv_magnetometry.py
	scripts/magnetometry/old_analysis_adptv_magnetometry_M=1.py
	scripts/magnetometry/old_analysis_adptv_magnetometry_maj_vote.py