添加光标
Merge branch 'cocos2d_3.2' of https://github.com/treen/cocos2d-x into cocos2d_3.2

Conflicts:
	cocos/ui/UITextField.cpp