Move to cocos2d-x 3.1