protocol path 1
Merge branch 'origin/master'

Conflicts:
	SOURCE/MainForm.dfm
	SOURCE/MainForm.pas
	TEST/DPR/ProjectTest.dpr
	TEST/DPR/ProjectTest.dproj
протокол