Display client counts for servers as players+bots.
Merge remote-tracking branch 'upstream/master' into refactor/console
fixing textmargins for the version/engine text and the inputline, which directly relates to the console rewrite as well as to #159