Merge branch 'master' into template

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml

core/lib/Thelia/Form/CategoryCreationForm.php

@@ -39,7 +39,8 @@ class CategoryCreationForm extends BaseForm
                     "for" => "title"
                 )
             ))
-            ->add("parent", "integer", array(
+            ->add("parent", "text", array(
+                "label" => Translator::getInstance()->trans("Parent category *"),
                 "constraints" => array(
                     new NotBlank()
                 )
@@ -49,6 +50,9 @@ class CategoryCreationForm extends BaseForm
                     new NotBlank()
                 )
             ))
+            ->add("visible", "integer", array(
+                "label" => Translator::getInstance()->trans("This category is online on the front office.")
+            ))
         ;
     }
 

core/lib/Thelia/Form/CategoryModificationForm.php

@@ -24,6 +24,7 @@ namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints\GreaterThan;
 use Thelia\Core\Translation\Translator;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 class CategoryModificationForm extends CategoryCreationForm
 {
@@ -36,12 +37,13 @@ class CategoryModificationForm extends CategoryCreationForm
         $this->formBuilder
             ->add("id", "hidden", array("constraints" => array(new GreaterThan(array('value' => 0)))))
 
-            ->add("visible", "checkbox", array(
-                "label" => Translator::getInstance()->trans("This category is online on the front office.")
+            ->add("url", "text", array(
+                "label"       => Translator::getInstance()->trans("Rewriten URL *"),
+                "constraints" => array(new NotBlank())
             ))
         ;
 
-        // Add standard description fields
+        // Add standard description fields, excluding title and locale, which a re defined in parent class
         $this->addStandardDescFields(array('title', 'locale'));
     }