Fix build, Add color Preference

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/LockscreenNotifications.java