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
added jsb support for AssetsMAnager
purgeStoragePath added
key with hash to support multiple assetsManager
DelegateProtocol is weak-referenced again
Port my variant of font-rendering over to dev branch -- adds correct alignment behavior.