修改代码格式
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into Sum_

Conflicts:
	src/client/zeusclient/control/controlobject/out_text.cpp
Merge pull request #8 from ZeusTeam/Sum_

Sum