udated items
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Prefabs/Items/AxeItem.prefab
	Assets/Prefabs/Items/SpearItem.prefab
	Assets/Prefabs/Items/SwordItem.prefab