Finished Styling of product detail page
Pull develop and resolve conflicts
Merge branch 'custom-product-detail' into dev