Настроил приложение
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/backend/views/layouts/main.php
	app/backend/views/site/index.php
	app/frontend/views/layouts/main.php
	app/frontend/views/site/index.php