Merge pull request #1 from dabingnn/mergecocos3.0

submodule cocos2d-x3.0rc0
Merge pull request #2 from dabingnn/mergecocos3.0

resolve cpp template
Merge branch 'xiaomergecocos3.0' into mergecocos3.0