Merge "Enable custom actions for double tap home (2/2)" into cm-10.2
Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/ButtonSettings.java

Change-Id: Icf900b500a3d84c819dccf68bde380ecbf3359c9