Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml
#	resources/views/pages/tarifs/index.blade.php

resources/views/main.blade.php

@@ -147,7 +147,7 @@
 
         <div id="home">
             <!-- Start cSlider -->
-            <div id="da-slider" class="da-slider" style="background-image: url('{{asset('assets')}}/slider/images/icons.png')">
+            <div id="da-slider" class="da-slider" style="background-image: url('{{asset('assets')}}/slider/images/iconcc.jpg')">
                 <div class="triangle" ></div>
                 <!-- mask elemet use for masking background image -->
                 <div class="mask" style="background-color: #328CC1;"></div>