memory leak when preloadEffect
Add PVR.CCZ encryption support to ZipUtils based upon http://www.codeandweb.com/texturepacker/contentprotection
Add sample to TestCPP.
Promote global functions and variables for PVR decryption to ZipUtils class.
Rename PVR decryption functions and variables to better fit in the Cocos2DX framework.
Improve log error notes.
Update TextureAtlasEncryptionTest to match revised function call in ZipUtils.
Update ccSetPvrEncryptionKeyPart documentation to clarify that encryption is never 100% secure.
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.
Added function ccSetPvrEncryptionKey(…) to set the encryption key in a single function call.
Updated the TextureAtlasEncryptionTest to show how to use the ccSetPvrEncryptionKey(…) function.
Updated the notes and header docs for improved clarity.
Add libwebp linkage (needed for asm.js validation)
Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten.
Merge pull request #2530 from dumganhar/master

Removing CocosPlayer project since it was moved to https://github.com/cocos2d/cocos2d-player
Merge branch 'TexturePacker-SpriteSheetProtection' of https://github.com/FlowerpotGames/cocos2d-x into TexturePacker-SpriteSheetProtection
add TexturePackerEncryptionTest into android, mac, linux, native client, marmalade project
Merge pull request #2531 from dumganhar/master

Don't use "recursive" property to search header file in "cocos2d-x/external" folder for TestCpp project.
add TexturePackerEncryptionTest into vs2010 project
export ZipUtils
Merge pull request #2532 from dumganhar/master

Moving CC_DEPRECATED_ATTRIBUTE to the front of functions in HttpRequest.h
Merge pull request #2434 from ggggamer/master

memory leak when preloadEffect
Update AUTHORS
Added win32 support