Added Inventory table controller.
Fixed storyboard merge conflicts.