some new code related to client info
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/connection.cpp
	src/connection.hpp