+一些基本的显示类
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle
no message
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	Classes/NBBattleScene/NBBattleScene.cpp