Все смердженное с Хансой ++
fflf
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Main/SiteBundle/Controller/BrandController.php
	Main/SiteBundle/Controller/CatalogController.php
	Main/SiteBundle/Controller/DefaultController.php
	Main/SiteBundle/Resources/views/Brand/Brand.html.twig
	Main/SiteBundle/Resources/views/Site/iconImageBlock.html.twig