Merge branch 'master' into loops

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php

documentation/api/files/Form/CustomerModification.php.txt

@@ -24,11 +24,9 @@
 namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints;
-use Thelia\Model\Customer;
-
-
-class CustomerModification extends BaseForm {
 
+class CustomerModification extends BaseForm
+{
     /**
      *
      * in this function you add all the fields you need for your Form.
@@ -53,6 +51,7 @@ class CustomerModification extends BaseForm {
     {
 
         $this->formBuilder
+            ->add('update_logged_in_user', 'boolean') // In a front office context, update the in-memory logged-in user data
             ->add("firstname", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
@@ -118,3 +117,4 @@ class CustomerModification extends BaseForm {
         return "thelia_customer_modification";
     }
 }
+