add OmniSwitch

Conflicts:
	default.xml

Conflicts:
	default.xml
Merge remote-tracking branch 'mahdi/kk-4.4.3' into kk-4.4.3