Merge branch 'hotfix' into devel

Conflicts:
	scoreboard/visualization/jsapp/chart/columns.js
right aligned labels
Merge branch 'devel' into staging