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

Conflicts:
	res/values/colors.xml
	src/com/android/dialer/dialpad/DialpadFragment.java