Merge remote-tracking branch 'origin/master'

Conflicts:
	Clients/ce_print/btZebra.suo
	Clients/ce_print/printtest/PrintTest/Invoice.vb
Merge remote-tracking branch 'origin/master'

Conflicts:
	Clients/ce_print/btZebra.suo
	Clients/ce_print/printtest/PrintTest/Invoice.vb