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

local/config/schema.xml

@@ -389,8 +389,14 @@
     <column name="code" size="10" type="VARCHAR" />
     <column name="locale" size="45" type="VARCHAR" />
     <column name="url" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
+    <column name="date_format" size="45" type="VARCHAR" />
+    <column name="time_format" size="45" type="VARCHAR" />
+    <column name="datetime_format" size="45" type="VARCHAR" />
+    <column name="decimal_separator" size="45" type="VARCHAR" />
+    <column name="thousands_separator" size="45" type="VARCHAR" />
+    <column name="decimals" size="45" type="VARCHAR" />
     <column name="by_default" type="TINYINT" />
+    <column name="position" type="INTEGER" />
     <behavior name="timestampable" />
   </table>
   <table name="folder" namespace="Thelia\Model">