Fixes
QSColors V2 fix

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