Fix for compiling error for windows
Bug fixes for new label
convert tab to space
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/2d/CCFontAtlas.cpp
	cocos/2d/CCFontDefinition.cpp
	cocos/base/CCConsole.cpp
Merge remote-tracking branch 'remotes/upstream/develop' into develop
Merge remote-tracking branch 'remotes/upstream/develop' into develop

Conflicts:
	cocos/2d/CCFontDefinition.cpp
Merge remote-tracking branch 'remotes/upstream/develop' into develop

Conflicts:
	cocos/2d/CCLabel.cpp
Merge develop
Syncing develop
Old / New label test
updateColor should be called after updating quads on alignText
New and old label comparison
Tab to space
Merge remote-tracking branch 'remotes/upstream/develop' into develop
remove unused header
remove CC Prefix
Merge pull request #5185 from hanjukim/develop

closed #3832: color and opacity settings are invalid when alignText.