ok
Merge branch 'origin/master'
ok
ok
Merge branch 'origin/master'

Conflicts:
	DATABASE/MEAT/PROCEDURE/LOAD1C/gpLoadSaleFrom1C.sql
	FormsMeat/MainForm.dfm
	FormsMeat/MainForm.pas