解决冲突问题
解决冲突问题
删除无用文件
Merge branch 'Sum_branch' of https://github.com/VNOC/vnoc into Sum_branch

Conflicts:
	NMessage/BufferMessage.h
	VNOC/test/NMessageTest.cpp