And again some updates to the installation scripts
Merge branch 'tests' of github.com:sara-nl/BeeHub into tests

Conflicts:
	Makefile