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

Conflicts:
	CocosBattleGame/Classes/NBBattleScene/NBBattleScene.cpp
	CocosBattleGame/Classes/NBBattleScene/NBBattleScene.h