Создание проекта
Merge branch 'master' of https://github.com/korinovsky/yii2-test

Conflicts:
	backend/config/main.php
	backend/controllers/SiteController.php
	backend/views/site/login.php
	common/config/params.php
	frontend/config/main.php