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

Conflicts:
	res/values-zh-rCN/strings.xml
	res/xml/preferences.xml

Change-Id: I02542a68970208b342e59b05a43eaafc0faaa29d