add DEPRECATED deprecated information for Armature::drawContour
Update Mac project setting and some lua test cases about UI and ActionTimeline
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
change ios and mac template's resource struct
Fix [Node:clipping -> Clipping to RenderTexture] crash
update for lay out
Merge branch 'v3' of https://github.com/liamcindy/cocos2d-x into v3
Merge pull request #8825 from liamcindy/v3

update for lay out
Merge pull request #8824 from Dhilan007/v3-fixcrash

Fix [Node:clipping -> Clipping to RenderTexture] crash
[AUTO]: updating luabinding automatically
[AUTO]: updating luabinding automatically
Merge pull request #8829 from CocosRobot/update_lua_bindings_1413557591

[AUTO]: updating luabinding automatically
Merge pull request #8828 from CocosRobot/update_lua_bindings_1413557585

[AUTO]: updating luabinding automatically
Merge pull request #8822 from huangshiwu/v3_fixtemplate

change ios and mac template's resource struct
Merge pull request #8818 from samuele3hu/v3_new_spine

Update Mac project setting and some lua test cases about UI and ActionTimeline
Merge pull request #8801 from 2youyouo2/v3

add deprecated information for Armature::drawContour
Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
Fix compile error triggered by UIHelper.cpp
Remove some comments