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: I734a07159d5ed692c6938d50d25cbace341c8e27