обновил
Merge branch 'master' of https://github.com/range-web/municipal_control

Conflicts:
	www/protected/models/ObjectType.php