редактор+вывод
Merge branch 'master' of https://github.com/abzdnua/vitaminb17

Conflicts:
	protected/views/site/manufacturer.php