ок
Merge branch 'origin/master'
разное
Merge branch 'origin/master'

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