Update CCLabelTTF.h
Update CCLayer.h
Update CCLayer.h
Update CCLayer.h
Update CCLayer.h
Update CCLayer.h
Update CCLayer.h
Update CCLabelTTF.h
Update CCLabelTTF.h
Update CCLayer.h
Update CCLayer.h
Update CCLabelTTF.h
Update CCLayer.h
Update CCLayer.h
Update CCLabelTTF.h
Merge branch 'v3' of https://github.com/daqian/cocos2d-x into v3

Conflicts:
	cocos/2d/CCLabelTTF.h
Merge pull request #117 from u0u0/v3

merge cclabelttf