mm
Merge branch 'master' of https://github.com/skmygdrs/PZ

Conflicts:
	PlantAndZombieMain/PlantAndZombieMain.xcodeproj/project.xcworkspace/xcuserdata/liwenhao.xcuserdatad/UserInterfaceState.xcuserstate
coding SpriteMap
have a bug, updateTransform is only valid when CCSprite is being rendered using an CCSpriteBatchNode
mm
mm