иконки
Merge remote-tracking branch 'origin/master'

Conflicts:
	develop/library/Database.php
	develop/objects/Contract.php
contract