Merge branch 'v2' into v2-edit-title

diff --cc src/Wallabag/CoreBundle/Form/Type/NewEntryType.php
index a2d203eac37302e10b331e1efe9913ac888e827a,4abdc10b37e4c00627f12df349a867f974aea569..cb96d11a2aa79194eeb11afa79c17c109d3b04b5
--- 1/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php
--- 2/src/Wallabag/CoreBundle/Form/Type/EntryType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php
@@@ -4,9 -4,9 +4,9 @@@ namespace Wallabag\CoreBundle\Form\Type
  
  use Symfony\Component\Form\AbstractType;
  use Symfony\Component\Form\FormBuilderInterface;
- use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+ use Symfony\Component\OptionsResolver\OptionsResolver;
  
 -class EntryType extends AbstractType
 +class NewEntryType extends AbstractType
  {
      public function buildForm(FormBuilderInterface $builder, array $options)
      {