TabletDirector-develop

• 

  David Butt 12 Jul 2016 f9ba6664ef1574d3cf42a9dc26e4d61e70b9f50d

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

  David Butt 12 Jul 2016 008725d06f1dc4f23995ee582fd1fe38817174d0

  fixed location override for zones and removed edit/delete buttons off of inventory

  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Views/Inventory/Edit.cshtml (diffs)