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

Conflicts:
	www/protected/modules/admin/views/default/deposits.php
	www/protected/modules/admin/views/default/operations.php
	www/protected/modules/user/controllers/AdminController.php
	www/protected/modules/user/views/admin/view.php
Merge branch 'master' of https://github.com/web-studio/project
обновил ЛК