comit
Merge branch 'develop' of https://github.com/VS-Studio3/build into develop
Merge branch 'develop' of https://github.com/VS-Studio3/build into develop
comit
Merge branch 'develop' of https://github.com/VS-Studio3/build into develop

Conflicts:
	media/zoo/applications/jbuniversal/templates/catalog/renderer/item/product/teaser.php
правки по цсс есть на складе