Signed-off-by: big <you@example.com>
Merge branch 'master' of git@github.com:oksamitnyj/samiekrasivie.git

Conflicts:
	modules/catalog/catalog.php
	modules/catalog/catalog.xsl

Signed-off-by: big <you@example.com>