Boh
Merge remote-tracking branch 'origin/master'

Conflicts:
	Matlab/[1] CPanel/ControlBoard1_90.asv
	Matlab/[1] CPanel/ControlBoard1_90.m
	Matlab/[1] CPanel/DataAcquisition1_05.asv
	Matlab/[1] CPanel/plotFromSamples1_05.asv
	Matlab/[1] CPanel/plotFromSamples1_05.m