Picture pool
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into DevilNeverCry

Conflicts:
	src/client/zeusclient/zeusclient.vcxproj.filters
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into DevilNeverCry
resource pool(picture)
xml_list(remove load)
添加返回begin end迭代器接口
封装获取属性函数 修改文件名
添加图片属性Posx Posy
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into DevilNeverCry

Conflicts:
	src/client/zeusclient/zeusclient.vcxproj
	src/client/zeusclient/zeusclient.vcxproj.filters
error
error
Merge branch 'Sum_' of https://github.com/ZeusTeam/Zeus into DevilNeverCry
text
修改XML代码错误
加入资源池
完成资源池接入
Merge pull request #13 from ZeusTeam/Sum_

Sum
修改tag
Merge pull request #14 from ZeusTeam/Sum_

修改tag
解决冲突