new img
Merge branch 'master' of https://github.com/ozntone/melarossa

Conflicts:
	templates/site/products/show.phtml