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

Conflicts:
	CocosBattleGame/proj.ios_mac/CocosBattleGame.xcodeproj/project.pbxproj