Merge branch 'master' of https://github.com/thelia/thelia into coupon

# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less

core/lib/Thelia/Controller/Admin/CouponController.php

@@ -118,9 +118,9 @@ class CouponController extends BaseAdminController
                 );
                 $this->adminLogAppend(
                     sprintf(
-                        'Coupon %s (ID %s) created',
-                        $couponEvent->getTitle(),
-                        $couponEvent->getCoupon()->getId()
+                        'Coupon %s (ID ) created',
+                        $couponEvent->getTitle()
+//                        $couponEvent->getCoupon()->getId()
                     )
                 );
                 // @todo redirect if successful

templates/admin/default/coupon/form.html

@@ -72,7 +72,7 @@
                     <label for="expiration-date">Expiration date :</label>
                     <div class="input-append date" data-date="12/02/2012" data-date-format="dd/mm/yyyy">
                         {form_field form=$form field='expirationDate'}
-                            <input type="text" id="expiration-date" name="expiration-date" value="{$value}">
+                            <input type="text" id="expiration-date" name="{$name}" value="{$value}">
                             {if $error}{$message}{/if}
                         {/form_field}
                         <span class="add-on"><span class="icon-th"></span></span>