Update enum values of ListView and the related test case
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_armature
Merge pull request #5711 from samuele3hu/master_armature

Update enum values of ListView and the related test case
fix compiling error on linux
Merge pull request #5714 from minggo/master-fix

fix compiling error on linux
fix template not include gui reader error
Merge pull request #5715 from andyque/fix_template

fix template not include gui reader error
reset VBO and vertexBuffer to zero before specify vertex data
Merge pull request #5722 from dabingnn/master_fix_glesDebugDrawGL502Error

reset VBO and vertexBuffer to zero before specify vertex data
The `setColor` of Widget was’t bound to lua,it would lead to crash
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_armature
Merge pull request #5726 from samuele3hu/master_armature

The `setColor` of Widget was’t bound to lua,it would lead to crash
Update the UIWidget.pkg according to the .h file and the related binding codes
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_armature
fix android compile bug
Merge pull request #5734 from dabingnn/master_fix_glesDebugDrawGL502Error

fix android compile bug
Update pkg file and some project setting
Merge pull request #5733 from samuele3hu/master_armature

Update the UIWidget.pkg according to the .h file and the related binding codes
Merge branch 'master' into master_nutty_modify_framework_for315