ok
Merge remote-tracking branch 'origin/master'
ok
Merge remote-tracking branch 'origin/master'

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