Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'mokee/jb-mr1_mkt' into HEAD

Conflicts:
	core/res/res/values/public.xml

Change-Id: Ifd9a41cd07baab8df6a20b9e7bea6c4028e17dcf
fix merge

Change-Id: I339fbe9ae8ae89900d8843f801051574bbab22ae