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

Conflicts:
	CocosBattleGame/cocos2d/cocos/editor-support/cocostudio/CCArmature.cpp
	CocosBattleGame/proj.ios_mac/CocosBattleGame.xcodeproj/project.pbxproj