+
Merge branch 'master' of https://github.com/pr-of-it/thinktwice
Merge branch 'master' of https://github.com/pr-of-it/thinktwice

Conflicts:
	www/protected/controllers/SiteController.php
+
Merge branch 'master' of https://github.com/pr-of-it/thinktwice

Conflicts:
	www/themes/thinktwice/views/site/userpage.php
Merge branch 'master' of https://github.com/pr-of-it/thinktwice
Merge branch 'master' of https://github.com/pr-of-it/thinktwice
обновил callrequest.php