fix compile error on TestLua
fix mac compile
fix WatermelonWithMe compile error
merge upstream
Modify mk
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
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5623 from CocosRobot/updategeneratedsubmodule_1394184793

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge branch 'master' into master_nutty_modify_framework_for315
Fixed resource path error
Modify action
Fixed bug of Setting anchor point
Merge pull request #15 from liamcindy/sceneAndUI

Scene and ui