closed #2410: Formatting codes in Texture2D::initWithString.

Conflicts:
	cocos2dx/textures/CCTexture2D.cpp