first edition
UpgradeBanner move sprite not bg
demo game
Merge branch 'master' of http://192.168.3.105:8080/gitlab/liyonghelpme/demoluaandwangguolua into mac

Conflicts:
	Resources/LuaScript/Battle/BattleGround.lua
	Resources/LuaScript/Battle/BattleRole.lua
	Resources/LuaScript/Event.lua
	Resources/LuaScript/Global/INCLUDE.lua
	Resources/LuaScript/Global/director.lua
	Resources/LuaScript/MyDia/AllFriend.lua
	Resources/LuaScript/MyDia/AllHeroes.lua
	Resources/LuaScript/MyDia/AllLevel.lua
	Resources/LuaScript/MyDia/AllUser.lua
	Resources/LuaScript/MyDia/Formation.lua
	Resources/LuaScript/MyDia/MainDialog.lua
	Resources/LuaScript/data/Static.lua
	Resources/LuaScript/main.lua
	Resources/LuaScript/ui.lua
	Resources/LuaScript/util.lua
	Resources/LuaScript/views/Dark.lua
	Resources/LuaScript/views/DialogController.lua
	Resources/LuaScript/views/UpgradeBanner.lua
configure of lua
fix Battle use top image
config of source
Merge branch 'master' of http://192.168.3.105:8080/gitlab/liyonghelpme/demoluaandwangguolua into mac
App Delegate cpp
cpp
all cpp file
Merge branch 'master' of http://192.168.3.105:8080/gitlab/liyonghelpme/demoluaandwangguolua into mac

Conflicts:
	Classes/AppDelegate.cpp
	Classes/iniReader.cpp
	Classes/platform/CCNative.h
	Classes/platform/VideoCamera.h
fix curl version get error i should read all data then handleIni
before merge curl
Merge branch 'master' of http://192.168.3.105:8080/gitlab/liyonghelpme/demoluaandwangguolua into mac

Conflicts:
	Classes/iniReader.cpp
why lua file is old?
word black
temp black
Merge branch 'master' of http://192.168.3.105:8080/gitlab/liyonghelpme/demoluaandwangguolua into mac
config.ini needupdate  bound font in battle ground