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

# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
  Working :
  Working :
  Working :
  Working :
  Fixed minor visual glitches
  Working : Resize countries flag + Add bootstrap-switch
  fix test suite
  clear asset cache in cache:cler command
  Added a 'development mode' to assetic smarty plugin
  rewriting router
  use good Request object
  Added Tools\URL test case, and a test case superclass for initializing Tools\URL
  remove unused UrlWritin controller
  create router for rewriting matching
  customer substitutions
  fix typo in front id
  Working : For attributes on labels
  Working : For attributes on labels
  add label_attr attribute to form smarty plugin
  start refactorin rewriting routing
  ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/less/thelia/bootstrap-editable.less
	templates/admin/default/categories.html

core/lib/Thelia/Coupon/CouponBaseAdapter.php

@@ -119,6 +119,17 @@ class CouponBaseAdapter implements CouponAdapterInterface
         // TODO: Implement getCartTotalPrice() method.
     }
 
+    /**
+     * Return the Checkout currency EUR|USD
+     *
+     * @return string
+     */
+    public function getCheckoutCurrency()
+    {
+        // TODO: Implement getCheckoutCurrency() method.
+    }
+
+
     /**
      * Return the number of Products in the Cart
      *