init Building
init building
Merge branch 'test' of http://github.com/liyonghelpme/mywangguo into iosmiao

Conflicts:
	Resources/LuaScript/Miao/TMXScene.lua
SessionMenu
session
Merge branch 'test' of http://github.com/liyonghelpme/mywangguo into iosmiao
Fight Scene
sTore goods
CityData
ignore repeat dialog show
Merge branch 'test' of http://github.com/liyonghelpme/mywangguo into iosmiao
cat action
Use update to move soldier not use moveAction
can go into mine from up or side
research Goods
new building new equip new buyable equip
Merge branch 'test' of http://github.com/liyonghelpme/mywangguo into iosmiao