Fixed bug of ScrollView
Merge branch 'master' into master_nutty_modify_framework_for315
fix android compile bug
Merge pull request #5734 from dabingnn/master_fix_glesDebugDrawGL502Error

fix android compile bug
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
Merge pull request #5740 from nutty898/master_nutty_modify_framework_for315

Master nutty modify framework for315