статус устранено
Merge branch 'master' of https://github.com/range-web/municipal_control

Conflicts:
	www/protected/modules/stk/views/departmentHead/_form/_editObjectType.php