fixed ui action will be wrong while loop play
resloved merge error
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
replace nullptr to NULL
Merge pull request #4216 from liamcindy/master

[ci skip]fixed animation play error for master