no message
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	CocosBattleGame/Classes/NBBattleScene/NBActionSprite.cpp
	CocosBattleGame/proj.ios_mac/CocosBattleGame.xcodeproj/project.pbxproj
动画事件修改
Merge branches 'master' and 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	CocosBattleGame/Classes/NBBattleScene/NBBattleScene.cpp
	CocosBattleGame/proj.ios_mac/CocosBattleGame.xcodeproj/project.pbxproj