new color system, 5th swatch

Conflicts:
	core/java/android/provider/Settings.java