обновил index.php
Merge branch 'master' of https://github.com/pr-of-it/thinktwice
обновил миграции
Merge branch 'master' of https://github.com/pr-of-it/thinktwice
обновил _form.php
Merge branch 'master' of https://github.com/pr-of-it/thinktwice

Conflicts:
	www/protected/views/user/_form.php
Merge branch 'master' of https://github.com/pr-of-it/thinktwice
обновлен User.php
Merge branch 'master' of https://github.com/pr-of-it/thinktwice
обновил client_secret
Merge branch 'master' of https://github.com/pr-of-it/thinktwice
обновил _form.php
Merge branch 'master' of https://github.com/pr-of-it/thinktwice

Conflicts:
	www/themes/thinktwice/views/user/_form.php
	www/themes/thinktwice/views/user/_search.php
	www/themes/thinktwice/views/user/_view.php
	www/themes/thinktwice/views/user/admin.php
	www/themes/thinktwice/views/user/view.php
Merge branch 'master' of https://github.com/pr-of-it/thinktwice
обновил views/user/
удалил themes/thinktwice/views/user
добавил themes/thinktwice/views/user/
обновил UserController.php
обновил UserController.php
Merge branch 'master' of https://github.com/pr-of-it/thinktwice