update cocos2d-x
Merge branch 'master' of github.com:dualface/quick-cocos2d-x