Merge pull request #1 from cocos2d/develop

Merge from trunk
Update README.md
Merge pull request #5287 from WanderWang/develop

fix a mistake about README
ios template compiles OK
Merge pull request #5288 from ricardoquesada/template_fixes

ios template compiles OK