Settings: Toggle to disable fullscreen keyboard (2/2)

Conflicts:

	AndroidManifest.xml
	res/values/cm_strings.xml
NFC Polling Mode (2/3)
Change-Id: I0e17ded93e9b82095e6bf8301c268017c49dd12b
Signed-off-by: Jubakuba <Jubakuba@gmail.com>

Conflicts:

	src/com/android/settings/WirelessSettings.java
Settings: MediaScanner behavior on boot (3/3)
Lets you enable/disable/ask (with a notification) media scanning on boot.
Can speed up boot and reduce initial boot lag from MediaScanner

Change-Id: I266f0adc1aaf2b28a7735d5b9cc965e699f06a6c

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	src/com/android/settings/DevelopmentSettings.java
tegra2 hack for cpu settings

Change-Id: I72f8695f5a02f7c5005d8b2ccd893f47f39dec80
Merge remote-tracking branch 'temasek/cm-10.2' into cm-10.2