Merge branch 'jellybean' into cm-10.2

Signed-off-by: David Rodero <david@codiguiel.net>

Conflicts:
	BoardConfig.mk
	DeviceParts/res/values-it/strings.xml
	DeviceParts/res/values/strings.xml
	DeviceParts/res/xml/advanced_preferences.xml
	DeviceParts/res/xml/screen_preferences.xml
	DeviceParts/src/com/cyanogenmod/settings/device/BatteryWorkDelay.java
	DeviceParts/src/com/cyanogenmod/settings/device/CpuBoostFreq.java
	DeviceParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
	DeviceParts/src/com/cyanogenmod/settings/device/Startup.java
	DeviceParts/src/com/cyanogenmod/settings/device/TouchscreenSensitivity.java
	etc/media_codecs.xml
	etc/vold.fstab
	galaxysl.mk
	init.latona.rc
	init.latona.usb.rc
	overlay/frameworks/base/core/res/res/values/config.xml
	power/power_latona.c
	system.prop
	ueventd.latona.rc
	usr/idc/atmel_mxt_ts.idc

Change-Id: I227cff68345172ffdd1cc5312fdcfd3bb010e00c