Added correct x/y locs
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/engines/InventoryEngine.ts
Added correct x/y locs and updated Sprites and items