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

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

Change-Id: I7e39c908cce1825f84bf9a3b23e0d9c6485bb345