ок
Merge branch 'origin/master'

Conflicts:
	Forms/Guides/ContractEdit.dfm