коммит перед сдачей
аывавы
Merge branch 'master' of https://github.com/N-S-Group/fruit

Conflicts:
	.idea/workspace.xml
	css/front/content.css
	protected/config/main.php
	protected/runtime/application.log
	protected/views/front/layouts/front.php
	protected/views/front/site/index.php