Merge branch 'devel' into staging

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