modify
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime