Fixed issue when non-ascii string used in script
Fix incorrect colors in CCDrawNode.
Added win32 support
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x
Updated README
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master

Conflicts:
	tools/jsbcc/src/main.cpp
Merge pull request #2536 from sunzhuoshi/master

fixed #2106: Adding compile tool of JS bytecode for win32.
Merge pull request #2526 from djh-/master

fixed #2140: The displayed color of CCDrawNode is incorrect when VAO is disabled.
Update AUTHORS
fixed #2142: Adding CCDataVisitor and Implementing CCPrettyPrinter, iOS port is ok.
fixed #2142: Adding travis-ci support for android.
fixed #2142: Reset the build status to my repo.
fixed #2142: Adding datavisitor support for other platforms except win32.
fixed #2142: updating win32.
Merge branch 'data-visitor' of https://github.com/dumganhar/cocos2d-x into iss2142-datavisitor
Travis only build master branch.
Bug fixes for Nacl port.
Fixing compilation errors for NaCl port.
Merge pull request #2406 from dumganhar/data-visitor

fixed #2142: Adding CCDataVisitor and Implementing CCPrettyPrinter.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x