Delete cach from branch
Delete cach from branch hot_fix
KP Diechi rabochie organi
Merge branch 'dev' of github.com:devlbr/lbr into dev
clear cached
Merge branch 'hot_fix' into dev

Conflicts:
	protected/modules/administrator/controllers/ProductsController.php
	protected/modules/administrator/views/contacts/manage.php
	protected/modules/administrator/views/pages/default.php
	protected/views/getkp/index.php
Merge branch 'master' into dev

Conflicts:
	protected/modules/administrator/controllers/BannersController.php
	protected/views/xbanner/items/_category.php
	protected/views/xbanner/items/_section.php
	protected/views/xbanner/items/_subsection_custrom.php
	protected/views/xbanner/items/_subsection_dieci.php
	protected/views/xbanner/items/_subsection_large.php