fix compile error on TestLua
fix mac compile
fix WatermelonWithMe compile error
merge upstream
Merge pull request #5610 from andyque/fixgui_master

fix compile error on TestLua
Merge pull request #5619 from andyque/testguijs_master

fix jsbindings compile error on master
Merge branch 'master' into master_nutty_modify_framework_for315