Merge branch 'development'

#Conflicts:
#	admin/countries.php
#	cart.php
#	custom/css/main.css
#	custom/customfunctions.php
#	custom/email/order-details-template.php
#	custom/email/order-invoice-template.php
#	custom/email/order-notification-template.php
#	custom/pages/about.php
#	custom/pages/about_morval.php
#	custom/settings/config.php
#	custom/settings/settings.php
#	functions.php
#	home.php
#	products.php
#	script.js

cart.php

@@ -181,6 +181,10 @@ $view .= '
                                 </td>';
                     }                
         $view .= '  <td class="cart_price product-total">'.currency_code.''.number_format($product['options_price'] * $product['quantity'],2).'</td>
+<<<<<<< HEAD
+=======
+                    <td><a href="'.url('index.php?page=cart&remove=' . $num).'" class="remove">🗑️</a></td>
+>>>>>>> development
                 </tr>';
             }
         }