Fix config
Merge remote-tracking branch 'homer/berry-v2'

Conflicts:
	config/cmd_right.cfg