Changes in qutau measurement
NK
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	lib/measurement2/qutau/qutau_measurement.py
Merge branch 'master' of https://github.com/teamdiamond/measurement
Merge branch 'master' of https://github.com/teamdiamond/measurement
ZenoDynamics in DD.py
NK