LCD density wizard now also clears gms and gsf

plus added 213 (nexus7) to the stock values
Conflicts:
	res/values/strings.xml
	res/xml/lcd_density_setup.xml
	src/com/android/settings/carbon/DensityChanger.java
Merge branch 'jb2' of git://github.com/CarbonDev/android_packages_apps_Settings into jb2
Fix FC.
Update Settings Icons
Update Settings Icons- hdpi
Center lockscreen at 240 DPI

This follows from the commit at https://github.com/CarbonDev/android_packages_apps_Phone/commit/255e05f40a2fa724c7a22c7f221acebb3ff5dfca
Reverted
Merge remote-tracking branch 'AOSP/jb-mr1.1-release' into jb-ras-mr1

Conflicts:
	AndroidManifest.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-ru/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/ChooseLockPatternTutorial.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/Settings.java
	tests/res/layout/bluetooth_request_permission_test.xml
	tests/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
Merge github.com:CarbonDev/android_packages_apps_Settings into jb2
Add back rambar.
Merge branch 'jb2' of git://github.com/CarbonDev/android_packages_apps_Settings into jb2

Conflicts:
	AndroidManifest.xml
	res/values-es/strings.xml
	res/values/strings.xml
	src/com/android/settings/Settings.java