berkelium-cpp: Read data from both client & server links.
Merge branch 'master' of https://github.com/berkelium/berkelium

Conflicts:
	berkelium-cpp/src/test/ChannelTest.cpp