master branch
BASH
Merge remote-tracking branch 'remotes/origin/master' into lt1-monitor

Conflicts:
	init/80_create_instruments.py
	userconfig.py