by Diia
Merge branch 'DetaliiProdus'

Conflicts:
	web/core/pages.php