Merge branch 'develop'

ShopBundle/Form/Frontend/TicketType.php

             );
         } else {
             // captcha
-            //$this->utils->addCaptchaType($builder);
+            $this->utils->addCaptchaType($builder);
         }
 
         $builder->add(
                         ]
                 );
 
-        $builder->add(
+        /*$builder->add(
                 'captchaCode',
                 CaptchaType::class,
                 array(
                         'captchaConfig' => 'TicketCaptcha',
                         'label' => 'Recopiez les caractères de l\'image'
                 )
-        );
+        );*/
 
     }