Update .gitignore
Fixed #5550: Refactor ccui.TextField's getStringValue to getString
Issue #5534: Make NodeRGBA extendable in JSB
Issue #5534: Reverse make NodeRGBA extendable in JSB
Fixed #5542: Modify the way to reference bindings scripts for Android
Fixed #5556: Make JSB FadeIn support two parameter as html5
Merge pull request #478 from joshuastray/master

ISSUE #5542: copy jsb scirpt files to script folder on win32
Fixed #5556: Reverse make JSB FadeIn support two parameter
(The problem should be solved in html5 engine, it shouldn't support two parameters)
Merge pull request #476 from pandamicro/master

Bug fixes
Issue #5096: remove draw of TouchesTest.js
Merge pull request #479 from VisualSJ/master

Issue #5096: remove draw of TouchesTest.js
Fixed #5566: Remove readonly prop declaration for Scene's init function
Update html5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #480 from pandamicro/master

Fixed #5566: Remove readonly prop declaration for Scene's init function
Update Cocos2d-x
Issue #5096: Reduction TouchesTest.js
Fixed #5567: [JSB] Take account of showFPS in project.json
Fixed #5567: [JSB] Remove log
Fixed #5534: Make NodeRGBA extendable in JSB