fix: when use different count custom properties in CocosBuilder will get wrong custom properties in game
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Update js_bindings_ccbreader.cpp

owner can equal null when ccbreader load a file
proj.mac FontTest fix (was not rendering TTFs)
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed set displayName when addDisplay
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed #Trigger
fixed #Trigger
1.support read tweenRotate property from dragonBone
2.change play several movement method
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
change play params
fixed #3445 resolved ui control's color will be changed while be cloned
Merge pull request #1 from liamcindy/ZCRealTrigger

fixed #3445 resolved ui control's color will be changed while be cloned
fixed memory leak
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed #RealTrigger
fixed #bug.
fixed root Node can't get.