updated item manager
Merge branch 'master' into dev