fix Jsb function getCPBody return type bug
Simplify AsyncStruct slightly -- make it a class, add a constructor.
Initial commit of browser accelerated async image-loading code for Emscripten.
fixed strokeColor and fontFillColor of CCLabelTTF
issue #2277: Add OpenGL lua binding
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop
fix url parse error for 'ws://domain.com/websocket' pattern
Get async image loading building with -O2 and asm.js
Merge pull request #9 from cocos2d/develop

Develop
solve android crash with CCLabelTTF setString function

solve android crash with CCLabelTTF setString function
Simple logging controls in testcpp index.html
Merge remote-tracking branch 'origin/master' into emscriptenate
Add advertisement type for more Ads plugins.
CCTexturePVR now sets its _format when unpacking from PVRv3 as well as PVRv2

When loading a PVRv3 the _format variable would not be set, always being the default value.
Bump Emscripten version
Update to testcpp makefile to include all assets, rather than cherrypicking.
fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate

Conflicts:
	cocos2dx/proj.emscripten/cocos2dx.mk
issue #2301: m_pTextures --> _pTextures.
issue #2301: Updating travis-scripts for emscripten.
issue #2301: _pTextures --> _textures.