Merge pull request #1 from renshan/develop

merge
review and corrections
Merge pull request #1 from renshan/develop

合并更新
校对 CCActionCamera
Merge pull request #69 from ZhouJ-sh/develop

Review js files of shader folder and text-input folder. Delete English comments and correct some errors.
Merge pull request #71 from sandDepp/develop

校对CCActionCamera
Merge pull request #70 from TurtleFromMars/develop

review and corrections
Translation
review

reviewed the node-grid and paralllax files.
Merge branch 'develop' of https://github.com/pascallin/cocos2d-html5 into develop

Conflicts:
	cocos2d/node-grid/CCNodeGrid.js
	cocos2d/parallax/CCParallaxNode.js
review CCClass.js
review CCCommon.js
review CCConfig.js
Merge pull request #73 from Yangtb/develop

review CCClass.js、CCCommon.js、CCConfig.js
review
review CCEGLView.js
review

Is it a reviewing or a translating job?
review

labelttf and layers have reviewed.
Merge pull request #74 from gagugagu/develop

review
Merge pull request #75 from Yangtb/develop

review CCEGLView.js