diff --git a/CHANGELOG.txt b/CHANGELOG.txt
new file mode 100644
index 000000000..57daada08
--- /dev/null
+++ b/CHANGELOG.txt
@@ -0,0 +1,11 @@
+2.0.0-beta2
+    http://doc.thelia.net is available in beta.
+    Increase performance in prod mode.
+    Front part (routes and controller) are now a dedicated module.
+    allow to create a customer in admin panel
+    translation is implemented :
+        - I18n directory in template or module.
+        - multiple extensions are available. We choose to used php but you can use other.
+        - You can translate your template or module from the admin.
+    Admin hook exists. With this hooks, a module can insert code in admin pages
+
diff --git a/install/import.php b/install/import.php
index ab1cba486..a2eae1f4f 100644
--- a/install/import.php
+++ b/install/import.php
@@ -159,7 +159,7 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co
                 }
 
                 $stock->setNewness($faker->randomNumber(0,1));
-                $stock->setWeight($faker->randomFloat(2, 100,10000));
+                $stock->setWeight($faker->randomFloat(2, 1,30));
                 $stock->save($con);
 
                 $productPrice = new \Thelia\Model\ProductPrice();
diff --git a/templates/frontOffice/default/assets/img/carousel/slider1.jpg b/templates/frontOffice/default/assets/img/carousel/slider1.jpg
new file mode 100644
index 000000000..3492ab6ee
Binary files /dev/null and b/templates/frontOffice/default/assets/img/carousel/slider1.jpg differ
diff --git a/templates/frontOffice/default/assets/img/carousel/slider1.png b/templates/frontOffice/default/assets/img/carousel/slider1.png
deleted file mode 100644
index d2a1f3628..000000000
Binary files a/templates/frontOffice/default/assets/img/carousel/slider1.png and /dev/null differ
diff --git a/templates/frontOffice/default/assets/img/carousel/slider2.jpg b/templates/frontOffice/default/assets/img/carousel/slider2.jpg
new file mode 100644
index 000000000..08ce939cf
Binary files /dev/null and b/templates/frontOffice/default/assets/img/carousel/slider2.jpg differ
diff --git a/templates/frontOffice/default/assets/img/carousel/slider2.png b/templates/frontOffice/default/assets/img/carousel/slider2.png
deleted file mode 100644
index eab0f625c..000000000
Binary files a/templates/frontOffice/default/assets/img/carousel/slider2.png and /dev/null differ
diff --git a/templates/frontOffice/default/assets/img/carousel/slider3.jpg b/templates/frontOffice/default/assets/img/carousel/slider3.jpg
new file mode 100644
index 000000000..a986bef0d
Binary files /dev/null and b/templates/frontOffice/default/assets/img/carousel/slider3.jpg differ
diff --git a/templates/frontOffice/default/assets/img/carousel/slider3.png b/templates/frontOffice/default/assets/img/carousel/slider3.png
deleted file mode 100644
index 2e91fd0f2..000000000
Binary files a/templates/frontOffice/default/assets/img/carousel/slider3.png and /dev/null differ
diff --git a/templates/frontOffice/default/assets/less/thelia/account.less b/templates/frontOffice/default/assets/less/thelia/account.less
index ab72cae1c..7d5b46a1a 100644
--- a/templates/frontOffice/default/assets/less/thelia/account.less
+++ b/templates/frontOffice/default/assets/less/thelia/account.less
@@ -49,6 +49,7 @@
 }
 
 // Message if no order or no address
+.deliveries-warning,
 .address-warning,
 .orders-warning {
     clear: both;
diff --git a/templates/frontOffice/default/index.html b/templates/frontOffice/default/index.html
index fabd8a3d9..7937c824f 100644
--- a/templates/frontOffice/default/index.html
+++ b/templates/frontOffice/default/index.html
@@ -12,13 +12,13 @@
             <div class="carousel-wrapper">
                 <div class="carousel-inner">
                     <figure class="item active">
-                        {images file='assets/img/carousel/slider1.png'}<img src="{$asset_url}" alt="img1">{/images}
+                        {images file='assets/img/carousel/slider1.jpg'}<img src="{$asset_url}" alt="Slider image 1">{/images}
                     </figure>
                     <figure class="item">
-                        {images file='assets/img/carousel/slider2.png'}<img src="{$asset_url}" alt="img2">{/images}
+                        {images file='assets/img/carousel/slider2.jpg'}<img src="{$asset_url}" alt="Slider image 2">{/images}
                     </figure>
                     <figure class="item">
-                        {images file='assets/img/carousel/slider3.png'}<img src="{$asset_url}" alt="img3">{/images}
+                        {images file='assets/img/carousel/slider3.jpg'}<img src="{$asset_url}" alt="Slider image 3">{/images}
                     </figure>
                 </div>
             </div>
diff --git a/templates/frontOffice/default/order-delivery.html b/templates/frontOffice/default/order-delivery.html
index 42ec5046d..99bb6550a 100644
--- a/templates/frontOffice/default/order-delivery.html
+++ b/templates/frontOffice/default/order-delivery.html
@@ -139,6 +139,7 @@
                             {/form_field}
                         </div>
                         {/loop}
+                        {elseloop rel="deliveries"}<div class="deliveries-warning">{intl l="<strong>Sorry!</strong> We are not able to give you a delivery method for your order."}</div>{/elseloop}
                     </div>
                 </div>