ADC Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	eReg/eRegulation/Control.class