TabletDirector-develop

• 

  David Butt 07 Jul 2016 001169a310711e3ddc87e96cb408a77b8534aaae

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

  David Butt 07 Jul 2016 467443e7c2dfd41229113bb652723a8fef8ab8e0

  fixed putaway issue if attributes are not valid/inventory not matching

  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Properties/PublishProfiles/SparkleInPink - Web Deploy.pubxml (diffs)
  • TabletDirector/TabletDirector.csproj (diffs)