merge totals
active Grand Total menu item bold
Merge branch 'master' into totals
add brackets for more readable code (at least loops should contain brackets)
Merge branch 'master' into totals

Conflicts:
	js/saiku/render/SaikuTableRenderer.js
Merge pull request #220 from lduburas/totals

active Grand Total menu item bold
remove leftover from i18n pull/217
merge master
 merge master
Merge branch 'master' into totals
Merge branch 'master' into totals
issue with totals cellset objects, etc
Merge branch 'master' into totals
Merge branch 'master' into totals
Merge branch 'master' into totals
merge subtotals