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

Conflicts:
	www/images/delete.png
	www/images/map_add.png
	www/images/photo_add.png
	www/protected/modules/stk/views/inspector/addressInfo.php
Merge branch 'master' of https://github.com/range-web/municipal_control
Merge branch 'master' of https://github.com/range-web/municipal_control
Merge branch 'master' of https://github.com/range-web/municipal_control
обновил
Merge branch 'master' of https://github.com/range-web/municipal_control