fixing crafing stuff
Merge branch 'master' of github.com:awalterman/survival

Conflicts:
	SurvivalPrototype/Assets/Textures/Icons/Knife_Icon_Small.png.meta
	SurvivalPrototype/Assets/Textures/Icons/Spear_Icon_Small.png.meta