Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Fix collider detection
1.Fix when first frame have no key frame, the armature don't display.
2.Fix color change bug
1.Fix color tween bug
1.Fix empty frame bug
2.Change Skin function interface name
update
Change Tween Type to Frame Index
remove CCShaderNode
Bone can add a particle display as a CCNode
Merge branch 'master' into develop
Change Physics detector
Remove vld.h
Merge branch 'master' into develop
1.Fix release CCTexture2DMutable.cpp crash
2.Change frame tween method
Port my variant of font-rendering over to dev branch -- adds correct alignment behavior.
Fix comment broken in last commit.
Win32 icons on template

Added icon to HelloCpp template, renamed the icon resource (so GLFW can
read it and put on window and taskbar), and removed unnecessary files
from projects.
issue #2768:Add LuaObjectBridge and LuaJavaBridge
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge