некие изменения
Merge branch 'master' of https://github.com/ivphpan/br-cms

Conflicts:
	protected/modules/admin/config/main.php
	protected/modules/market/MarketModule.php
	protected/modules/market/controllers/ProductController.php
	themes/admin/views/layouts/main.php