fix change parent bug
read bonedata zorder
fix load particle file crash
Merge branch 'v2x' of https://github.com/2youyouo2/cocos2d-x into v2x
Split box2d and chipmunk example
1.Add frame event param
2.Guaranteed to trigger frame event
pipu reconfigure slider, list view, add parse direction of scrollview
Merge pull request #8 from 2youyouo2/v2x

update armature
Merge pull request #9 from pipu/pipu_reconfiguration_slier_listview

pipu reconfigure slider, listview, add parse direction attribute of scrollview
pipu add guy samples resources
Merge pull request #10 from pipu/pipu

pipu add guy samples resources
fixes #4422
Merge pull request #11 from chengstory/#4422

fixes #4422
Merge branch 'v2x' of git://github.com/chukong/cocos2d-x into v2x
fixes #4423
Merge pull request #12 from chengstory/#4423

fixes #4423
fixes #4224 modify slider set scale9 render.
Merge pull request #13 from chengstory/#4424

fixes #4224 modify slider set scale9 render.
pipu modify slider, textfield parse
Merge pull request #14 from pipu/pipu_modify_slider_textfield

pipu modify slider, textfield parse for set character max length