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