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

custom/pages/about_morval.php

@@ -11,6 +11,10 @@ $view .= '
 <section class="hero" style="background-image:url('.base_url.featured_about_morval_image.');">
     <div class="hero-content">
         <h1>'.$h2_about_morval_1.'</h1>
+<<<<<<< HEAD
+=======
+        <a href="'.url(link_to_collection).'" class="hero-btn">'.$h2_brand_visit.'</a>
+>>>>>>> development
     </div>
 </section>