FUN- 14:View product details.
Merge branch 'master' of github.com:Lexy92/Funeral
FUN 14:View product details.
FUN 14:View product details
Merge branch 'master' of github.com:Lexy92/Funeral
Merge branch 'master' of github.com:Lexy92/Funeral
Merge branch 'master' of github.com:Lexy92/Funeral
Merge branch 'master' of github.com:Lexy92/Funeral

Conflicts:
	mvc/app/controller/product.php
	mvc/app/view/product_view.tpl.php