fix loi sale
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/apps/merchant/app/sale/deliveryManager/deliveryManagerThumbnail.coffee