fix:fix two bug
Merge pull request #5567 from samuele3hu/master_armature

close #4285:The setFrameEventCallFunc and setMovementEventCallFunc of CCArmature called at the same time in lua script would lead to crash
Merge pull request #5559 from samuele3hu/masterFix

fix two bug
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_armature