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

Conflicts:
	scripts/bell/calibrate_Bell.py
	scripts/bell/params_lt3.py
bs
Merge branch 'bs_branch'