! Расчистка SiteContoller
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/protected/controllers/UserController.php