ok
ok
Merge branch 'origin/master'

Conflicts:
	DPR/Project.dproj
	DPR/Project.res
	Forms/Document/CashJournal.dfm
	Forms/LOAD1C/LoadSaleFrom1C.dfm
	FormsMeat/MainForm.dfm
	FormsMeat/MainForm.pas
	TEST/DPR/ProjectTest.dpr
	TEST/DPR/ProjectTest.dproj
ok
Merge branch 'origin/master'