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

Conflicts:
	www/protected/modules/admin/controllers/DefaultController.php