2
test
Merge branch 'master' of https://github.com/yaowei1188/iGame

Conflicts:
	Classes/Battle/MDBattleLayer.cpp