Fixed some bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	SeHacWebServer/Logfiles/ControlServer.log.txt