Merge branch 'franck' into admin

Conflicts:
	composer.lock
	core/lib/Thelia/Core/Thelia.php

composer.json

@@ -21,7 +21,14 @@
         "symfony/routing" : "2.2.*",
         "symfony/filesystem" : "2.2.*",
         "symfony/yaml" : "2.2.*",
-        "symfony-cmf/routing": "1.0.0"
+        "symfony-cmf/routing": "1.0.0",
+
+        "symfony/form": "2.2.*",
+        "symfony/validator": "2.2.*",
+        "symfony/security": "2.2.*",
+        "symfony/templating": "2.2.*",
+
+        "smarty/smarty": "v3.1.13"
     },
     "require-dev" : {
         "fzaninotto/faker": "dev-master"
@@ -32,7 +39,7 @@
         "bin-dir" : "bin"
     },
     "autoload": {
-        "psr-0": { 
+        "psr-0": {
             "": "local/modules/",
             "Thelia" : "core/lib/"
         }