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.
Fixing CCScale9Sprites when loaded from CCB files to be able to change color and opacity
Fixing coloring in CCControlButtons by overriding the set/get color functions
Add libwebp linkage (needed for asm.js validation)
Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten.
Merge branch 'TexturePacker-SpriteSheetProtection' of https://github.com/FlowerpotGames/cocos2d-x into TexturePacker-SpriteSheetProtection
add TexturePackerEncryptionTest into android, mac, linux, native client, marmalade project
add TexturePackerEncryptionTest into vs2010 project
export ZipUtils
fix Null pointer access
Added win32 support
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x
Updated README
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master

Conflicts:
	tools/jsbcc/src/main.cpp