StatusBar Color Setting: merge Color Setting

Change-Id: I33727e54bd4ae88455bc80890d4e0e238429bbd1
Signed-off-by: anerik <anerikgames@gmail.com>

Conflicts:
	res/values/dokdo_strings.xml
	res/xml/network_usage_stats.xml
	res/xml/status_bar.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java
	src/com/android/settings/lego/NetworkUsageStats.java