TabletDirector-develop

• 

  David Butt 12 Jul 2016 b5b2b04a386b6eb1aace1b753693784679be141d

  Merge remote-tracking branch 'origin/2.6' into Trunk
• 

  David Butt 12 Jul 2016 e2dea3c6a176db7cd3c5c844e719defa686129ab

  edit inventory issue, removed functionality from tablet diector

  • TabletDirector/Controllers/InventoryController.cs (diffs)
  • TabletDirector/Services/InventoryService.cs (diffs)
  • TabletDirector/Views/Inventory/Edit.cshtml (diffs)