Device Settings: Gamma, Color Calibration and Vibration Intensity (CM)

Conflicts:
	Android.mk
	res/values/arrays.xml
	res/xml/preference_headers.xml
	src/com/oct/tentacles/SettingsActivity.java