Add getter and setter for TextColor to Text Widget
Remove update of content size as it won't change
Add missing space in function definition
Correct some typos/mistakes in declarations
GLView Hook
Merge pull request #7587 from dzl-ian/fixTextWidgetColor

Add getter and setter for TextColor to Text Widget
[AUTO][ci skip]: updating cocos2dx_files.json
[ci skip]
[ci skip]
[AUTO]: updating luabinding automatically
Merge pull request #7640 from CocosRobot/update_cocosfiles_1406865528

[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #7641 from CocosRobot/update_lua_bindings_1406865618

[AUTO]: updating luabinding automatically
Merge branch 'v3' into v3_pr

Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
Merge pull request #7630 from huangshiwu/v3_pr

GLView Hook
[AUTO]: updating luabinding automatically
Merge pull request #7646 from CocosRobot/update_lua_bindings_1406879478

[AUTO]: updating luabinding automatically
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #7648 from CocosRobot/update_cocosfiles_1406879885

[AUTO][ci skip]: updating cocos2dx_files.json
merge cocos2d, fix lua