fix Lua code
miao shadow
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
no d
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
fix util
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
config load code from 3.105
error data
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao

Conflicts:
	Resources/LuaScript/ui.lua
	Resources/config.ini
ios not support label color yet
fix download script bug
fang.ttf or postscript name of fonts or file name need to be same?
before merge grass
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao

Conflicts:
	Classes/UpdateScene.cpp
	Resources/LuaScript/data/constant.lua
use local data
Merge branch 'tmx' of http://github.com/liyonghelpme/mywangguo into iosmiao