статус
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Forms/Transport.dfm
Merge remote-tracking branch 'refs/remotes/origin/master'
траспорт