Fixed issue when non-ascii string used in script
Add libjpeg linkage.
Merge remote-tracking branch 'origin/master' into emscriptenate
Fix incorrect colors in CCDrawNode.
Add libwebp linkage (needed for asm.js validation)
Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten.
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
Fix ccCArray
Use asm.js by default.
Merge pull request #2538 from FlowerpotGames/ccCArray-Fix

fixed #2127: Fix for broken of ccArrayGetIndexOfObject after merging this commit(076f38c).
Update AUTHORS
Merge pull request #2541 from j4m3z0r/emscriptenate

Compile for Emscripten in asm.js mode
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.