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

Conflicts:
	scripts/bell/params_lt3.py
	scripts/bell/params_lt4.py