тест

тестируем
Merge remote-tracking branch 'origin/master'

Conflicts:
	Catalog/Category.php