Cocos2d-x 3.1
Merge branch 'cocos2d-x'