冲突代码问题解决。
Merge branch 'master' of https://github.com/sailzeng/zcelib

Conflicts:
	src/commlib/soarlib/soar_svrd_app_base.cpp
	src/commlib/soarlib/soar_svrd_app_base.h
	src/commsvr/ogre4asvrd/ogre_application.h
	src/commsvr/wormholesvrd/wormhole_application.cpp
	src/commsvr/wormholesvrd/wormhole_application.h
	src/commsvr/zergsvrd/zerg_application.cpp
冲突引发的错误修正完成。