Commit message describing your changes

# Conflicts:
#	resources/views/front/pages/shop/product-detail.blade.php
