Updated Displays
Merge branch 'upstream' of github.com:madgane/finna-be-bugfixes into upstream

Conflicts:
	startupScript.m