Merge remote-tracking branch 'origin/master'

Conflicts:
	MWSWebSolution/LabelPrintingInterface/bin/LabelPrintingInterface.dll
	MWSWebSolution/LabelPrintingInterface/bin/LabelPrintingInterface.pdb