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/AdminLogin.php.txt

@@ -22,13 +22,11 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Validator\Constraints\Choice;
-
-class AdminLogin extends BaseForm {
 
+class AdminLogin extends BaseForm
+{
     protected function buildForm()
     {
         $this->formBuilder
@@ -40,11 +38,11 @@ class AdminLogin extends BaseForm {
             ))
             ->add("password", "password", array(
                 "constraints" => array(
-                	new NotBlank()
+                    new NotBlank()
                 )
             ))
             ->add("remember_me", "checkbox", array(
-            		'value' => 'yes'
+                    'value' => 'yes'
             ))
             ;
     }