fixed strokeColor and fontFillColor of CCLabelTTF

Conflicts:
	cocos2dx/textures/CCTexture2D.cpp