123
Merge branch 'master' of http://github.com/sbushinskii/tradeshop

Conflicts:
	application/views/description_popup.php