show ip of connecting player
fix favorites show
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	src/server.cpp