Added basic Inventory interface
Merge branch 'linnea'
Merge branch 'master' into oskar
Merge branch 'linnea'
Merge branch 'master' into linnea