fixed path to zlib
fixed path to zlib
fixed path to zlib
updated key file
fixed path to zlib
fix xcode can not compile
Merge pull request #7367 from geron-cn/chukongv2

fix xcode can not compile
Merge pull request #7364 from MSOpenTech/wp8-v2-fix

WP8 v2 fix for zlib include path
fixed crash cause by incorrect font name.
Merge pull request #7369 from Dhilan007/v2

fixed crash cause by incorrect font name.
fixed hidden array index overflow.
udpate hd  csbs
Merge pull request #7372 from geron-cn/chukongv2

fix cpp-test csb crash in hd res
Merge pull request #2 from cocos2d/v2

merge V2
fixed bugs:
Merge pull request #7370 from Dhilan007/v2

fixed hidden array index overflow in CCImage.cpp.
Merge pull request #7374 from Dhilan007/v2-225

fixed bugs:set incorrect font for LabelTTF in 'LabelReader::setPropsFromBinary'
Win32 v2 fix for zlib include path.
fix watermelonwithme compile error
Merge pull request #7375 from Dhilan007/v2-225

Win32 v2 fix for zlib include path.