update
Merge branch 'Sum_' of https://github.com/ZeusTeam/Zeus into DevilNeverCry
text
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into DevilNeverCry

Conflicts:
	src/client/zeusclient.v11.suo
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into DevilNeverCry
加入宽、高
补漏
Merge branch 'able_' of https://github.com/ZeusTeam/Zeus into Sum_
修改创建场景
Merge branch 'DevilNeverCry' of https://github.com/ZeusTeam/Zeus into Sum_

Conflicts:
	bin/client/res/xml/picture.xml