modified:   common/util.h
	modified:   plnode/ds/host_address.h
	modified:   plnode/ds/overlay_id.h
	modified:   plnode/message/message.h
	modified:   server_system_test.cc
Merge branch 'master' of github.com:srcvirus/klink

util.h conflict
	modified:   server_system_test.cc
Merge branch 'master' of github.com:srcvirus/klink

sasd
Merge branch 'master' of github.com:srcvirus/klink
	modified:   common/util.h
	modified:   server_system_test.cc
Merge branch 'master' of github.com:srcvirus/klink
	modified:   common/util.h
	modified:   server_system_test.cc