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.
A typo fix in EventDispatcher, DirtyFlag::FIXED_PRITORY —> DirtyFlag::FIXED_PRIORITY.
Merge pull request #5130 from dumganhar/develop

A typo fix in EventDispatcher, DirtyFlag::FIXED_PRITORY —> DirtyFlag::FIXED_PRIORITY.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/2d/CCFontAtlas.cpp
	cocos/2d/CCFontDefinition.cpp
	cocos/base/CCConsole.cpp
Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int
issue #3713: remove Object::_autoReleaseCount
#include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence  when header file changes.
Include fix: CCFileUtils.h —> platform/CCFileUtils.h
LocalStorage: const char* —> const std::string&.
[Travis CI] Removes -j10.
Updates jsbindings and localStorage.
Reverts run-script.sh. add -j10 to improve build.
Compilation fixes in LocalStorage. include localStorage.h.