From LT3, Bell changes
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	lib/cython/PQ_T2_tools/T2_tools_bell.pyd
From BS, BEll changes
Merge branch 'master' of file:///y:/measurement/ into bs_branch