Обновил
Merge branch 'master' of https://github.com/range-web/gkh2
Обновил ГЖИ
Merge branch 'master' of https://github.com/range-web/gkh2

Conflicts:
	public_html/themes/crm/views/houses/part_one.php