adwin lt2 cr modular conversion
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	lib/config/adwins.py