More changes to items and sprites
Merge remote-tracking branch 'origin/master'