temp
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio

Conflicts:
	extensions/CocoGUILIB/Drawable/UICCTextField.cpp
Merge pull request #76 from nutty898/master

modify gui lib