Changed - a lot of things
Added - saving result files
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server/ConnectionHandler.cpp
	server/main.cpp