verzak1_branch added inventory screen
Merge branch 'master' into verzak1_branch
Fixed indent