Controller update
revert rules back to normal
Merge remote-tracking branch 'origin/HEAD'

Conflicts:
	AMDES_KBS/AMDES_KBS/bin/Debug/ADD.exe