add Cyanogenmod Profiles (2/2)

Conflicts:

	AndroidManifest.xml
	res/values/mahdi_arrays.xml
	res/values/mahdi_strings.xml
	src/com/android/settings/Settings.java

Conflicts:

	AndroidManifest.xml
	res/values/mahdi_strings.xml
	res/values/styles.xml
	src/com/android/settings/Settings.java

Conflicts:
	AndroidManifest.xml
	res/layout/preference_icon.xml
	res/values/mahdi_arrays.xml
	res/values/mahdi_strings.xml
	res/xml/power_menu_settings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/SettingsPreferenceFragment.java
	src/com/android/settings/mahdi/PowerMenu.java

Change-Id: Ie17419380aa095221454304cd4259a97638ccfba
fix merge

Change-Id: Ia95459c7dc65566a9d03eb057f7d556f2226a850