Custom Carrier label

Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Conflicts:
	src/com/android/settings/cyanogenmod/UserInterface.java