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

# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php

composer.json

@@ -11,7 +11,7 @@
         "php": ">=5.4",
         "ezyang/htmlpurifier": "dev-master",
         "ircmaxell/password-compat": "dev-master",
-        "propel/propel": "2.0.0-alpha1",
+        "propel/propel": "dev-master",
         "psr/log" : "1.0",
         "symfony/class-loader": "2.2.*",
         "symfony/config" : "2.2.*",
@@ -27,7 +27,7 @@
         "symfony-cmf/routing": "1.0.0",
 
         "symfony/form": "2.2.*",
-        "symfony/validator": "2.3.*@dev",
+        "symfony/validator": "2.3.*",
 
         "smarty/smarty": "v3.1.14",
         "kriswallsmith/assetic": "1.2.*@dev",