Latest config file for CCD
Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/libsc/com/k60/lcd.cpp