dfgdfg
Merge branch 'master' of https://github.com/N-S-Group/azimut-invest.com

Conflicts:
	protected/components/ControlerCPanel.php
	protected/controllers/cpanel/GoodsController.php
16 29