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

Conflicts:
	res/values/cm_colors.xml

(cherry picked from commit 3a3b3f8dc3741c2b1f7d96ec5e7e25cdfa1e95f0)