Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
Fixed bad commit
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.
documentation
Check for 0 length in CCPoint::normalize()
Check for 0 length in CCPoint::normalize()
Log assert messages

Now, assert messages as visible in the trace output
as well as the line number of condition that failed.
Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert

Also remove the first "cond" argument, since it is always false.
Update AUTHORS
Add Makefiles for Emscripten + Emscripten external
Add #defines for Emscripten platform
Add main.cpp files for app samples
bool x = NULL  =>  bool x = false, to silence Clang.
ifdef tango around some symbols that aren't defined in Emscripten (nor a bunch of other platforms, it seems).
Add freetype 2.4.11 to repo
Revert "Add freetype 2.4.11 to repo"

This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
Remove freetype source and add libfreetype.a as built by the Emscripten test-suite.

Revert "Add freetype 2.4.11 to repo"

This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
Instruct Emscripten to emit .html file for HelloCpp sample.
Build fixes for emscripten, add linkage to libfreetype.a
Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html