change some const char* to const std::string&
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string

Conflicts:
	cocos/2d/renderer/CCNewSprite.cpp
	cocos/2d/renderer/CCNewSprite.h
	cocos/2d/renderer/CCNewTextureAtlas.cpp
	cocos/2d/renderer/CCNewTextureAtlas.h
change some const char* to const std::string&
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string

Conflicts:
	cocos/2d/renderer/CCNewSpriteBatchNode.cpp
	cocos/2d/renderer/CCNewSpriteBatchNode.h
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string

Conflicts:
	cocos/2d/platform/CCFileUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCImageCommon_cpp.h
	cocos/2d/platform/CCSAXParser.cpp
	cocos/2d/platform/CCSAXParser.h
fix android compile error
change “string.compare()” to “==“
Merge pull request #4631 from boyu0/const_char_star_to_std_string

Change const char* to const std::string&