improve lasers
issue #4693: add getName(), setName() and getChildByName()
Merge branch 'v3' into v3Animation
extract mesh data, material data, skin data into a header file for reuse in converter and engine
support relative path for reading json
fixed calculating height of multi-line string was incorrect on IOS.
Ensuring release cache texture in timely.
Merge pull request #35 from dabingnn/v3Animation

V3 animation
add AsyncReader
added missing files
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3

Conflicts:
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
Merge pull request #7041 from MSOpenTech/wp8-v3-update

added missing ObjectFactory files
fixed typo.
new parameter for setting blur shader effect
loader
Modify ini files for bindings-generator to fix the compile warning
Reconstruct the addEventListener for cocostudio ui control
remove the comments
issue #4693: added enumerateChildren()
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.