cc
Merge branch 'master' of https://github.com/kmodry/iced

Conflicts:
	views/infoProduct.php
cc