Make the plugin be compatible with both cocos2d-x-2.2 & cocos2d-x-3.0.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3925 from natural-law/develop

Update the status of submodule plugin