fix the crash invoked by deprecated `create` function of `Label`
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
fix compile error
Merge pull request #6231 from samuele3hu/develop_fix

fix the crash invoked by deprecated `create` function of `Label`
Merge pull request #23 from cocos2d/develop

update cocos2d-x