modified:   agent
	modified:   plnode/protocol/plexus/plexus_message_processor.h
	modified:   plnode/protocol/plexus/plexus_protocol.h
	modified:   server.cc
Merge branch 'master' of github.com:srcvirus/klink

Conflicts:
	agent