обновил userpage
Merge branch 'master' of https://github.com/pr-of-it/thinktwice

Conflicts:
	www/protected/controllers/UserFollowerController.php
обновил SiteController.php
обновил SiteController.php
Merge branch 'master' of https://github.com/pr-of-it/thinktwice