Item updates
Merge branch 'master'
Merge branch 'master' into MapCreation