Inventory work
Merge remote-tracking branch 'origin/newView' into newView

Conflicts: