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
fix:Update the RELEASE_NOTES.md file
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
fix:Update some description
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
Merge remote-tracking branch 'remotes/upstream/develop' into develop

Conflicts:
	cocos/2d/CCLabel.cpp
issue #3822:Update the accelerometerTest by the new event-dispatcher
Merge develop
issue #3781, Should check ndk architechture.
[Jenkins] add auto generate bindings for win7
Syncing develop
issue #3823: Updates glfw to the latest release v3.0.4.
issue #3823: Updates desktop/CCEGLView.h/.cpp to support fullscreen. Use EGLView::initWithFullScreen() to initialize a window with full screen.
issue #3823: Updates travis-ci script to use the latest release of glfw (v3.0.4).
issue #3823: Updates glfw to v3.0.4 for windows.