closed #2815: Fixed the bug in ZipUtils::ccInflateMemoryWithHint(): it doesn't copy the previous unpacked data into new memory when malloced memory is not enough.
Merge GUI to develop step 1;
Add guy loading of scene
Modify makefiles
Modify member names
Fix compilation errors for CocoGUI.
Updating Android.mk
closed #2745: fix bug: _dataLen not set at Image::initWithString() and Image::initWithStringShadowStroke()
[CocoGUI] Updating linux makefile.
Merge pull request #3618 from dumganhar/nutty898-MergerGUIDevelop

[GUI] Merge PR https://github.com/cocos2d/cocos2d-x/pull/3613 [ci skip]
set default projection to 3d
Merge pull request #3615 from boyu0/bug2815_Texture2DTest_crash

closed #2815: Fixed the bug in ZipUtils::ccInflateMemoryWithHint(): it d...
Merge pull request #3619 from minggo/develop

[ci skip]set default projection to 3d
Merge pull request #3617 from boyu0/bug2745_after_PerformanceTextureTest_render_error

closed #2745: fix bug: _dataLen not set at Image::initWithString() and I...
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop