Fixed merge error
Update zh_CN.lang
Merge pull request #39 from ViKaleidoscope/patch-1

Update zh_CN.lang
Remove ProxyHungerOverhaul; there is no 1.7.2 HO
 * Closes #37
Fix server crash when getting food values of items in a food container
 * FoodStats.setFoodLevel/setFoodSaturationLevel are client only because who knows
 * Fixes #38
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7.x

Conflicts:
	java/squeek/spiceoflife/proxy/ProxyHungerOverhaul.java
Merge branch '1.7.x' of https://github.com/squeek502/SpiceOfLife into 1.7.10

Conflicts:
	java/squeek/spiceoflife/asm/Hooks.java
	java/squeek/spiceoflife/foodtracker/FoodValues.java
	java/squeek/spiceoflife/helpers/FoodHelper.java