new
Merge branch 'master' of https://github.com/Yangzhilang/BabyJoy_ZhiWu

Conflicts:
	Classes/AppDelegate.cpp
	Classes/ZW_FloweData.cpp
	Classes/ZW_Flower.cpp
	Classes/ZW_Flower.h
	Classes/ZW_FlowerData.h
	Classes/ZW_FlowerState.cpp
	Classes/ZW_FlowerState.h
	Classes/ZW_GameData.h
	Classes/ZW_GameMainScene.cpp
	Classes/ZW_MainPannelLayer.cpp
	Classes/ZW_MainPlantLayer.cpp
	Classes/ZW_MainPlantLayer.h
	Classes/ZW_Packback.cpp
	Classes/ZW_ToolKit.cpp
	Resources/zhiwu/blue_enchantress_aniamtion_0.png
	Resources/zhiwu/blue_enchantress_aniamtion_1.png
	Resources/zhiwu/blue_enchantress_aniamtion_2.png
	Resources/zhiwu/blue_enchantress_aniamtion_3.png
	Resources/zhiwu/caterpillar.png
	Resources/zhiwu/caterpillar_0.png
	Resources/zhiwu/caterpillar_1.png
	Resources/zhiwu/chemical_fertilizer_0.png
	Resources/zhiwu/daisy_animation_0.png
	Resources/zhiwu/daisy_animation_1.png
	Resources/zhiwu/daisy_animation_2.png
	Resources/zhiwu/daisy_animation_3.png
	Resources/zhiwu/flower_animation.plist
	Resources/zhiwu/flower_blue_enchantress_0.png
	Resources/zhiwu/flower_blue_enchantress_1.png
	Resources/zhiwu/flower_blue_enchantress_2.png
	Resources/zhiwu/flower_daisy_0.png
	Resources/zhiwu/flower_daisy_1.png
	Resources/zhiwu/flower_lanvender_0.png
	Resources/zhiwu/flower_lanvender_1.png
	Resources/zhiwu/flower_lanvender_2.png
	Resources/zhiwu/flower_lily_0.png
	Resources/zhiwu/flower_lily_1.png
	Resources/zhiwu/flower_lily_2.png
	Resources/zhiwu/flower_lily_of_the_valley_0.png
	Resources/zhiwu/flower_lily_of_the_valley_1.png
	Resources/zhiwu/flower_lily_of_the_valley_2.png
	Resources/zhiwu/flower_mirabilis_jalapa_0.png
	Resources/zhiwu/flower_mirabilis_jalapa_1.png
	Resources/zhiwu/flower_mirabilis_jalapa_2.png
	Resources/zhiwu/flower_rose_0.png
	Resources/zhiwu/flower_rose_1.png
	Resources/zhiwu/flower_rose_2.png
	Resources/zhiwu/flower_safflower_0.png
	Resources/zhiwu/flower_safflower_1.png
	Resources/zhiwu/flower_sunflower_0.png
	Resources/zhiwu/flower_sunflower_1.png
	Resources/zhiwu/flower_sunflower_2.png
	Resources/zhiwu/harvest_star_0.png
	Resources/zhiwu/harvest_star_1.png
	Resources/zhiwu/harvest_star_2.png
	Resources/zhiwu/harvest_star_3.png
	Resources/zhiwu/lavender_animation_0.png
	Resources/zhiwu/lavender_animation_1.png
	Resources/zhiwu/lavender_animation_2.png
	Resources/zhiwu/lavender_animation_3.png
	Resources/zhiwu/lavender_animation_4.png
	Resources/zhiwu/lavender_animation_5.png
	Resources/zhiwu/lily_animation_0.png
	Resources/zhiwu/lily_animation_1.png
	Resources/zhiwu/lily_animation_2.png
	Resources/zhiwu/lily_animation_3.png
	Resources/zhiwu/lily_of_the_valley_animation_0.png
	Resources/zhiwu/lily_of_the_valley_animation_1.png
	Resources/zhiwu/lily_of_the_valley_animation_2.png
	Resources/zhiwu/lily_of_the_valley_animation_3.png
	Resources/zhiwu/mirabilis_jalapa_animation_0.png
	Resources/zhiwu/mirabilis_jalapa_animation_1.png
	Resources/zhiwu/mirabilis_jalapa_animation_2.png
	Resources/zhiwu/mirabilis_jalapa_animation_3.png
	Resources/zhiwu/mum_animation_0.png
	Resources/zhiwu/mum_animation_1.png
	Resources/zhiwu/mum_animation_2.png
	Resources/zhiwu/mum_animation_3.png
	Resources/zhiwu/mum_animation_4.png
	Resources/zhiwu/mum_animation_5.png
	Resources/zhiwu/rose_animation_0.png
	Resources/zhiwu/rose_animation_1.png
	Resources/zhiwu/rose_animation_2.png
	Resources/zhiwu/rose_animation_3.png
	Resources/zhiwu/safflower_animation_0.png
	Resources/zhiwu/safflower_animation_1.png
	Resources/zhiwu/safflower_animation_2.png
	Resources/zhiwu/sunflower_animation_0.png
	Resources/zhiwu/sunflower_animation_1.png
	Resources/zhiwu/sunflower_animation_2.png
	Resources/zhiwu/sunflower_animation_3.png
	Resources/zhiwu/sunflower_animation_4.png
	Resources/zhiwu/sunflower_animation_5.png
	Resources/zhiwu/sunflower_animation_6.png
	Resources/zhiwu/sunflower_animation_7.png
	Resources/zhiwu/weed.png