Merge remote-tracking branch 'origin/Server' into Server

Conflicts:
	Proftaak Remote Healthcare/Server/Program.cs

Tom code in wrong class.