构建
Merge branch 'master' of https://github.com/xujianming/Alpha

Conflicts:
	AlphaClient/AlphaClient.sln
	AlphaClient/AlphaCommon/AlphaCommon.vcxproj