Issue:Resolve the carsh of the simple game test sample and modify the main.cpps in the template for  the android projects
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest

Conflicts:
	samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
Merge pull request #3620 from samuele3hu/developTest

Develop test
upstream synchronize
Merge pull request #3621 from minggo/develop

upstream synchronize
[GUI] Fixing compilation errors for win32.

Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
[GUI] Fix compilation error on win32.
Merge pull request #3622 from dumganhar/develop

[GUI] Fixing compilation errors for win32. [ci skip]
Merge branch 'develop' into 2youyouo2-develop

Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters