before ios miao
Merge branch 'iosmiao' of http://github.com/liyonghelpme/mywangguo into test

Conflicts:
	Resources/LuaScript/Miao/TMXScene.lua
server update script
Android font
Tech get Goods
save Arena data and ownBuilding data
finish Castle reward implement
Magic Soldier add
Cavalry and Magic soldier
Cavalry soldier midpoint
arrow  magic fight back
4 kind of hero
add hero Effect to Soldier
hero skill and data
add Hero Config to Fight
Hero in Game show it
before big block Land
Stage One village 4 part black
fix Equip Attack calculate first cal base attribute attack then add
equip attack
initExtend Land Code