поиск в шапке сайта
Merge branch 'master' of https://github.com/Jurets/cleanroom

Conflicts:
	protected/views/layouts/main.php
	protected/views/layouts/product.php