ok
Merge remote-tracking branch 'refs/remotes/origin/master'
Доступ
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/origin/master'
ок
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Forms/Guides/Contract.dfm
Тесты