Merge cocos2d-x v3 branch and fix issues