Updates cocos2d-x
Merge pull request #40 from dumganhar/master

Updates cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-lua into tip_generator