Загрузка
Merge branch 'origin/master'

Conflicts:
	SOURCE/MainForm.dfm
	SOURCE/MainForm.pas