TabletDirector-develop

• 

  Clint Furse 03 Nov 2014 a3de2923d0c874fe96e05136774062a4a9e42d3b

  Merge branch 'master' into develop
  Conflicts:
          TabletDirector/TabletDirector.csproj
• 

  Clint Furse 03 Nov 2014 f399d794b5e5ab28392627612c4090e9bee8d9d0

  additional logging added

  • TabletDirector/Controllers/BatchController.cs (diffs)
  • TabletDirector/Controllers/OrderController.cs (diffs)
  • TabletDirector/LocalServices/InventoryService.cs (diffs)
• 

  Clint Furse 03 Nov 2014 20de29ca002bdc6644d583c630a0ed6693c5cdac

  fixed crash with mvc library

  • TabletDirector/TabletDirector.csproj (diffs)