English fixes
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into english_fixes

Conflicts:
	CHANGELOG
Merge pull request #8067 from ricardoquesada/english_fixes

English fixes