Fixed non-directly-edible foods being allowed in food containers
 * Fixes food containers being nestable
Fixed console spam when HO and Harder Peaceful were both installed
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7.x
Merge branch '1.7.x' of https://github.com/squeek502/SpiceOfLife into 1.7.10

Conflicts:
	java/squeek/spiceoflife/helpers/FoodHelper.java