фикс
Merge origin/master
Merge pull request #24 from org-espe/project

Project
Merge origin/master
права в проектах
Merge pull request #25 from org-espe/project

Project
merge project->master
Merge origin/master

Conflicts:
	protected/controllers/ProjectsController.php
Merge remote-tracking branch 'origin/master' into project