Calculator: bugfixes

	Fix an error in the matrices module
	causing incorrect results in some languages

Change-Id: I13dc93326d0992c69b8af78f5297c7c2b90a26d6
Merge "Calculator: bugfixes" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD