Merge CM

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