spine新版API
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	CocosBattleGame/cocos2d/build/cocos2d_libs.xcodeproj/project.pbxproj
	CocosBattleGame/cocos2d/cocos/editor-support/spine/CCSkeleton.cpp
	CocosBattleGame/cocos2d/cocos/editor-support/spine/CCSkeleton.h
	CocosBattleGame/cocos2d/cocos/editor-support/spine/Skeleton.cpp
	CocosBattleGame/cocos2d/cocos/editor-support/spine/Skeleton.h
	CocosBattleGame/cocos2d/cocos/editor-support/spine/SkeletonJson.cpp
	CocosBattleGame/cocos2d/cocos/editor-support/spine/Slot.h
	CocosBattleGame/proj.ios_mac/CocosBattleGame.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle
冲突修改