merge cocos2d-x

resolve conflict.