issue #3626:Add the “override “ keyword
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into test-rebase
Merge pull request #5117 from samuele3hu/test-rebase

close #3626:Add the “override “ keyword