Fix for compiling error for windows
Bug fixes for new label
convert tab to space
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
update xcode project.
fix compiling error cause by include a non-existent file.
fix compiling error cause by miss include header file.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/2d/CCFontAtlas.cpp
	cocos/2d/CCFontDefinition.cpp
	cocos/base/CCConsole.cpp
issue #3713: remove Object::_autoReleaseCount
issue #3713:invoke static member function to destroy singleone object
issue #3713: remove unneeded codes to fix compiling error
move some method to FontFreeType that only relating to FontFreeType from Font.
Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject
Merge remote-tracking branch 'remotes/upstream/develop' into develop
closed #2572, The arithmetic of child's position in ParallaxNode::addChild() is wrong.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
close #3802: Add some manual lua-binding functions for the Lable and update the related test cases
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerf
issue #3781, Update genbinding script to fit new bindings-generator.