Solving 'black screen' on android
fixing Linux build
more clean up
new dynamic TTF label stuff
start integrating FreeType for font rendering
ready to integrate FreeType
libfreetype for iOS and Mac

libfreetype for iOS and Mac
Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel

Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
library compiled without bzip2
use freetype
Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel<<<<<<< HEAD
=======

>>>>>>> origin
some more work on freetype
Changed the order of function calls within CocosDenshion::SimpleAudioEngine::end()
to first detach the OpenAL source from the buffers so that sound buffers can be successfully deleted afterwards.

Additionally, improved the documentation within the header file a little bit.
small API changes

::create()
and const chars
Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes

Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
closed #2410: Formatting codes in Texture2D::initWithString.
new stuff for FreeType
Add JSFunctionWrapper in preparation for bindings-generator changes.
Some more changes to make the code more c++ friendly:

- nodeToParentTransform -> getNodeToParentTransform() (the same for its friends)
   - Deprecates the old methods
   - adds 'consts' to those methods
- boundingBox() -> getBoundingBox()
   - the new one is const
   - Deprecates the old method.
- Adds overrides keywords in CCNodeRGBA and CCArmature
- AffineMatrix are mutables
issue  #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGl,Scrollview handlers operation.