tmp
Merge remote-tracking branch 'origin/master'

Conflicts:
	FormsMeat/MainForm.dfm
	FormsMeat/MainForm.pas
	TEST/DPR/ProjectTest.dpr
	TEST/DPR/ProjectTest.dproj
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 270752fd5913ab8ca29cf3273d454e21e3a98534.
Merge remote-tracking branch 'origin/master'

Conflicts:
	FormsMeat/MainForm.dfm
	FormsMeat/MainForm.pas
	TEST/DPR/ProjectTest.dpr
	TEST/DPR/ProjectTest.dproj