фикс
Merge origin/master
Merge origin/master
права в проектах
merge project->master
Merge origin/master

Conflicts:
	protected/controllers/ProjectsController.php