Updated Linux version
Merge branch 'jsfra_base_v1.0' of github.com:madgane/glowing-octo-nemesis into jsfra_base_v1.0

Conflicts:
	startupScript.m