Merge branch 'develop' of https://github.com/OS2web/os2web8 into develop

Author: juuliabellcom

web/themes/custom/fds_custom_theme/dist/stylesheets/stylesheet.css

@@ -383,7 +383,7 @@ $grid-xs:                     0 !default;
 $grid-sm:                     576px !default;
 $grid-md:                     768px !default;
 $grid-lg:                     992px !default;
-$grid-xl:                     1240px;
+$grid-xl:                     1300px;
 
 // Grid breakpoints..
 $grid-breakpoints: (