更新
Merge branch 'master' of https://github.com/syj2010syj/RPLegend

Conflicts:
	map/lua/game/army.lua
	map/lua/game/init.lua
	map/lua/init.lua
	map/war3map.j
	map/war3map.w3i
	map/war3map.w3r
	map/war3map.w3u
	map/war3mapMap.blp