修正BUG
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into Sum
修正格式
加入Text类
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into Sum

Conflicts:
	src/client/zeusclient/control/controlobject/texture.h
Merge pull request #3 from ZeusTeam/Sum

Sum