New log format, some server stuff
Merge remote-tracking branch 'origin/server' into launcher