Merge remote-tracking branch 'cyan/cm-10.1' into cm-10.1

Conflicts:
	res/values-fr/strings.xml
Merge remote-tracking branch 'cyan/cm-10.1' into cm-10.1
Merge branch 'cm-10.1' into martincz
Merge remote-tracking branch 'mm/cm-10.1' into HEAD