Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_InCallUI into cm-11.0

Conflicts:
	res/values-de/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-fr-rCA/strings.xml
	res/values-it/strings.xml
	res/values/colors.xml