Меню
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/views/layouts/main.php
Merge branch 'master' of https://github.com/PiloTeZ/Products-catalog