companion-block sizing fix
Merge branch 'master' into resource-picker

Conflicts:
	src/templates/working_area.yate