Minor schanges on system integration.
Merge branch 'master' of https://github.com/satnet-project/satnet-release-1

Conflicts:
	WebServices/requirements.txt
	scripts/server-setup.sh