module heroin
Merge branch 'master' of https://github.com/GreeZZly/mynicedecor
багфиксы
Merge branch 'master' of https://github.com/GreeZZly/mynicedecor

Conflicts:
	application/views/main/products_view.php
загрузка картинко