Fixed #2433: Fix ArmatureAnimation's setMovementEventCallFunc and setFrameEventCallFunc
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #2434 from pandamicro/develop

Fixed #2433: Fix ArmatureAnimation's setMovementEventCallFunc and setFrameEventCallFunc