changes for custom carrier label, working but currently fc's when OK in dialog is selected, to be fixed

Conflicts:

	res/xml/system_settings.xml
conflicter