ne pomny commit
Merge branch 'master' of https://github.com/sberdashkevich/Yii2TestProject

Conflicts:
	frontend/views/layouts/main.php
Merge remote-tracking branch 'origin/master'