Merge pull request #24 from cocos2d/develop

update cocos2d-x
add no-res
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime
Merge pull request #6280 from chuanweizhang2013/luaruntime

update