Fixed not showing locked items in inventory modal.
Merge branch 'master' into production