Settings: add options to show/hide lockscreen carrier label

Conflicts:
	res/values/custom_strings.xml->candy_strings.xml
	res/xml/custom_settings.xml->candy_main_settings.xml

 Author:    Altaf-Mahdi <altaf.mahdi@gmail.com>
re arrange our statusbar interface
-my ocd be killin me

Signed-off-by: errantzebra845 <errantzebra845@gmail.com>
Merge branch 'c5' of https://github.com/CandyRoms/packages_apps_Settings into c5