this conflict shit

This reverts commit d13b1c0552898ffd9ca388708dcd93451c17fe20.

Conflicts:
	vscape Server/datajson/content/itemDefinitions.json