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
small API changes

::create()
and const chars
new stuff for FreeType
rendering using free type. This commit is a work in progress and should NOT be used
clean up and now using FreeType for rendering fonts
some more cleanup
render and font IOS are no more
working on the new atlas stuff
some more cleanup
Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge

Conflicts:
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontDefinition.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	cocos2dx/label_nodes/CCStringTTF.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
Merge branch 'developNewLabelMerge' into merge_new_label

Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/textures/CCTexture2D.h
	samples/Javascript/Shared