Expanded Desktop Settings

Conflicts:
	res/values/psx_arrays.xml
	res/values/psx_strings.xml
	res/xml/powermenu_settings.xml
	src/com/android/settings/PowermenuSettings.java