Merge branch 'master' of https://github.com/BotterLiu/triones

Conflicts:
	examples/baseclient/main.cpp
	src/net/hashioc.cpp
	src/net/hashioc.h
	src/net/iocomponent.cpp
	src/net/iocomponent.h
	src/net/socket.cpp
	src/net/socket.h
	src/net/transport.cpp
	src/net/transport.h