From b82b4ffd34e55d272e58a7d81f607dab1745b7f9 Mon Sep 17 00:00:00 2001
From: Polonkai Gergely <polesz@w00d5t0ck.info>
Date: Sun, 22 Jul 2012 19:38:00 +0200
Subject: [PATCH] Made document editing possible

---
 .../Controller/DocumentController.php         |  88 ++-
 src/KekRozsak/FrontBundle/Entity/Document.php |  90 ++++
 .../FrontBundle/Form/Type/DocumentType.php    |  27 +
 .../Resources/views/Document/create.html.twig |   9 +
 .../views/Document/documentView.html.twig     |   7 -
 .../Resources/views/Document/edit.html.twig   |   9 +
 .../Resources/views/Document/view.html.twig   |   9 +
 .../views/Group/groupDocuments.html.twig      |  22 +-
 vendor/composer/installed.json                | 502 +++++++++---------
 vendor/kriswallsmith/assetic/.gitignore       |   4 +
 vendor/kriswallsmith/assetic/composer.json    |   2 +
 .../src/Assetic/Filter/CompassFilter.php      |  22 +-
 .../src/Assetic/Filter/Sass/SassFilter.php    |  11 +-
 .../src/Assetic/Filter/Sass/ScssFilter.php    |   4 +-
 .../Filter/Yui/BaseCompressorFilter.php       |   7 +-
 .../kriswallsmith/assetic/tests/bootstrap.php |   4 +-
 .../AsseticBundle/Command/DumpCommand.php     |   2 +-
 .../Resources/config/filters/compass.xml      |   1 +
 .../Resources/config/filters/sass.xml         |   1 +
 .../Resources/config/filters/scss.xml         |   1 +
 .../views/Collector/swiftmailer.html.twig     |   8 +-
 vendor/symfony/symfony/UPGRADE-2.1.md         |  36 +-
 .../src/Symfony/Bridge/Doctrine/CHANGELOG.md  |   1 +
 .../Doctrine/Form/DoctrineOrmTypeGuesser.php  |   5 +-
 .../Doctrine/Form/Type/DoctrineType.php       |   6 +-
 .../Constraints/UniqueValidatorTest.php       |  71 ++-
 .../Validator/Constraints/UniqueEntity.php    |   1 +
 .../Constraints/UniqueEntityValidator.php     |   2 +-
 .../Bridge/Twig/Extension/FormExtension.php   | 346 ++----------
 .../Symfony/Bridge/Twig/Form/TwigRenderer.php |  41 ++
 .../Bridge/Twig/Form/TwigRendererEngine.php   | 183 +++++++
 .../Twig/Form/TwigRendererEngineInterface.php |  27 +
 .../Twig/Form/TwigRendererInterface.php       |  27 +
 .../Bridge/Twig/Node/FormThemeNode.php        |   2 +-
 .../Extension/FormExtensionDivLayoutTest.php  |  36 +-
 .../FormExtensionTableLayoutTest.php          |  36 +-
 .../Bridge/Twig/Tests/Node/FormThemeTest.php  |   4 +-
 .../DataCollector/RequestDataCollector.php    |  89 ----
 .../Resources/config/collectors.xml           |   4 +-
 .../Resources/config/templating_php.xml       |  12 +-
 .../Resources/views/Form/attributes.html.php  |   2 +-
 .../views/Form/checkbox_widget.html.php       |   2 +-
 .../views/Form/choice_options.html.php        |   2 +-
 .../views/Form/choice_widget.html.php         |   4 +-
 .../Form/choice_widget_collapsed.html.php     |   6 +-
 .../Form/choice_widget_expanded.html.php      |   2 +-
 .../views/Form/container_attributes.html.php  |   2 +-
 .../Resources/views/Form/date_widget.html.php |   4 +-
 .../views/Form/datetime_widget.html.php       |   4 +-
 .../views/Form/email_widget.html.php          |   2 +-
 .../views/Form/field_enctype.html.php         |   2 +-
 .../views/Form/field_errors.html.php          |   2 +-
 .../Resources/views/Form/field_label.html.php |   2 +-
 .../Resources/views/Form/field_rest.html.php  |   2 +-
 .../Resources/views/Form/field_row.html.php   |   2 +-
 .../Resources/views/Form/field_rows.html.php  |   2 +-
 .../views/Form/field_widget.html.php          |   2 +-
 .../Resources/views/Form/form_widget.html.php |   4 +-
 .../views/Form/form_widget_compound.html.php  |   4 +-
 .../views/Form/form_widget_simple.html.php    |   2 +-
 .../views/Form/hidden_widget.html.php         |   2 +-
 .../views/Form/integer_widget.html.php        |   2 +-
 .../views/Form/money_widget.html.php          |   2 +-
 .../views/Form/number_widget.html.php         |   2 +-
 .../views/Form/password_widget.html.php       |   2 +-
 .../views/Form/percent_widget.html.php        |   2 +-
 .../views/Form/radio_widget.html.php          |   2 +-
 .../views/Form/repeated_row.html.php          |   2 +-
 .../views/Form/search_widget.html.php         |   2 +-
 .../views/Form/textarea_widget.html.php       |   2 +-
 .../Resources/views/Form/time_widget.html.php |   4 +-
 .../Resources/views/Form/url_widget.html.php  |   2 +-
 .../FormTable/form_widget_compound.html.php   |   4 +-
 .../Templating/Helper/FormHelper.php          | 306 +++--------
 .../Helper/FormHelperDivLayoutTest.php        |  10 +-
 .../Helper/FormHelperTableLayoutTest.php      |  10 +-
 .../Security/Factory/AbstractFactory.php      |   4 +-
 .../Security/Factory/AbstractFactoryTest.php  |   9 +-
 .../TwigBundle/Resources/config/twig.xml      |  12 +-
 .../views/Profiler/toolbar_style.html.twig    |   6 +-
 .../Component/EventDispatcher/CHANGELOG.md    |   2 +-
 ...tcher.php => ImmutableEventDispatcher.php} |   2 +-
 ...t.php => ImmutableEventDispatcherTest.php} |   8 +-
 .../src/Symfony/Component/Finder/Finder.php   |   2 +-
 .../Component/Form/AbstractRendererEngine.php | 206 +++++++
 .../src/Symfony/Component/Form/CHANGELOG.md   |  12 +-
 .../Form/Extension/Core/Type/ChoiceType.php   |   6 +-
 .../Extension/Core/Type/CollectionType.php    |   6 +-
 .../Form/Extension/Core/Type/DateType.php     |   6 +-
 .../Form/Extension/Core/Type/TimeType.php     |   6 +-
 .../DependencyInjectionExtension.php          |   7 +-
 .../Templating/TemplatingRendererEngine.php   | 125 +++++
 .../Type/FormTypeValidatorExtension.php       |  10 +-
 .../src/Symfony/Component/Form/Form.php       | 113 +++-
 .../Symfony/Component/Form/FormRenderer.php   | 350 ++++++++++++
 .../Form/FormRendererEngineInterface.php      | 146 +++++
 .../Component/Form/FormRendererInterface.php  | 180 +++++++
 ...FormConfig.php => ImmutableFormConfig.php} |   8 +-
 .../Form/Tests/AbstractDivLayoutTest.php      |   2 +-
 .../Component/Form/Tests/CompoundFormTest.php |   2 +-
 .../Extension/Core/Type/DateTimeTypeTest.php  |   2 +-
 .../Extension/Core/Type/DateTypeTest.php      |   2 +-
 .../Extension/Core/Type/TimeTypeTest.php      |   2 +-
 .../Component/Form/Tests/FormRendererTest.php | 105 ++++
 .../Component/Form/Tests/SimpleFormTest.php   |  19 +-
 .../Form/Tests/Util/FormUtilTest.php          |  59 --
 .../Symfony/Component/Form/Util/FormUtil.php  |  29 -
 .../Component/HttpFoundation/Response.php     |  21 +-
 .../HttpFoundation/ResponseHeaderBag.php      |  10 +-
 .../HttpFoundation/Tests/ResponseTest.php     |  27 +
 .../DataCollector/RequestDataCollector.php    |  56 +-
 .../EventListener/ProfilerListener.php        |  10 +-
 .../Tests/Stub/StubIntlDateFormatterTest.php  |   2 +-
 .../Component/OptionsResolver/LazyOption.php  |  22 +-
 .../Component/OptionsResolver/Options.php     |  98 ++--
 .../OptionsResolver/OptionsResolver.php       |  12 +-
 .../OptionsResolverInterface.php              |  10 +-
 .../OptionsResolver/Tests/LazyOptionTest.php  |  44 ++
 .../Tests/OptionsResolverTest.php             |   4 +-
 .../src/Symfony/Component/Process/Process.php |   4 +-
 .../src/Symfony/Component/Routing/Route.php   |   4 +-
 .../AbstractAuthenticationListener.php        |   2 +-
 .../Component/Templating/PhpEngine.php        |  14 +
 .../Validator/Constraints/TrueValidator.php   |  10 +-
 .../constraint-mapping-1.0.xsd                |   6 +-
 vendor/twig/twig/CHANGELOG                    |   3 +-
 .../twig/twig/doc/filters/number_format.rst   |   4 +-
 vendor/twig/twig/doc/recipes.rst              |   2 +-
 vendor/twig/twig/doc/templates.rst            |   9 +
 vendor/twig/twig/doc/tests/empty.rst          |   2 +-
 vendor/twig/twig/lib/Twig/Extension/Debug.php |   2 +-
 vendor/twig/twig/lib/Twig/Loader/Chain.php    |  12 +-
 vendor/twig/twig/lib/Twig/Template.php        |   2 +-
 .../twig/test/Twig/Tests/escapingTest.php     |   4 -
 web/bundles/ivoryckeditor/ckeditor.js         |   2 +-
 web/bundles/ivoryckeditor/config.js           |   8 +-
 136 files changed, 2734 insertions(+), 1289 deletions(-)
 create mode 100644 src/KekRozsak/FrontBundle/Form/Type/DocumentType.php
 create mode 100644 src/KekRozsak/FrontBundle/Resources/views/Document/create.html.twig
 delete mode 100644 src/KekRozsak/FrontBundle/Resources/views/Document/documentView.html.twig
 create mode 100644 src/KekRozsak/FrontBundle/Resources/views/Document/edit.html.twig
 create mode 100644 src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig
 create mode 100644 vendor/kriswallsmith/assetic/.gitignore
 create mode 100644 vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRenderer.php
 create mode 100644 vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
 create mode 100644 vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererEngineInterface.php
 create mode 100644 vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererInterface.php
 delete mode 100644 vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php
 rename vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/{UnmodifiableEventDispatcher.php => ImmutableEventDispatcher.php} (96%)
 rename vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/{UnmodifiableEventDispatcherTest.php => ImmutableEventDispatcherTest.php} (91%)
 create mode 100644 vendor/symfony/symfony/src/Symfony/Component/Form/AbstractRendererEngine.php
 create mode 100644 vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
 create mode 100644 vendor/symfony/symfony/src/Symfony/Component/Form/FormRenderer.php
 create mode 100644 vendor/symfony/symfony/src/Symfony/Component/Form/FormRendererEngineInterface.php
 create mode 100644 vendor/symfony/symfony/src/Symfony/Component/Form/FormRendererInterface.php
 rename vendor/symfony/symfony/src/Symfony/Component/Form/{UnmodifiableFormConfig.php => ImmutableFormConfig.php} (96%)
 create mode 100644 vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormRendererTest.php
 create mode 100644 vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Tests/LazyOptionTest.php

diff --git a/src/KekRozsak/FrontBundle/Controller/DocumentController.php b/src/KekRozsak/FrontBundle/Controller/DocumentController.php
index 48ac6c0..ed543f2 100644
--- a/src/KekRozsak/FrontBundle/Controller/DocumentController.php
+++ b/src/KekRozsak/FrontBundle/Controller/DocumentController.php
@@ -6,13 +6,17 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
+use KekRozsak\FrontBundle\Entity\Document;
+use KekRozsak\FrontBundle\Form\Type\DocumentType;
+use KekRozsak\FrontBundle\Extensions\Slugifier;
+
 class DocumentController extends Controller
 {
 	/**
 	 * @Route("/dokumentum/{documentSlug}", name="KekRozsakFrontBundle_documentView")
 	 * @Template()
 	 */
-	public function documentViewAction($documentSlug)
+	public function viewAction($documentSlug)
 	{
 		$docRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:Document');
 		if (!($document = $docRepo->findOneBySlug($documentSlug)))
@@ -22,4 +26,86 @@ class DocumentController extends Controller
 			'document' => $document,
 		);
 	}
+
+	/**
+	 * @Route("/dokumentumok/uj/{groupSlug}", name="KekRozsakFrontBundle_documentCreate", defaults={"groupslug"=""})
+	 * @Template()
+	 */
+	public function createAction($groupSlug = '')
+	{
+		$groupRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:Group');
+		$group = $groupRepo->findOneBySlug($groupSlug);
+		/* TODO: make group fully optional */
+
+		$document = new Document();
+		$document->setSlug('n-a');
+		$form = $this->createForm(new DocumentType(), $document);
+		$request = $this->getRequest();
+
+		if ($request->getMethod() == 'POST')
+		{
+			$form->bindRequest($request);
+
+			if ($form->isValid())
+			{
+				$slugifier = new Slugifier();
+				$document->setSlug($slugifier->slugify($document->getTitle()));
+				$document->setCreatedAt(new \DateTime('now'));
+				$document->setCreatedBy($this->get('security.context')->getToken()->getUser());
+
+				if ($group)
+				{
+					$group->addDocument($document);
+					$document->addGroup($group);
+				}
+
+				$em = $this->getDoctrine()->getEntityManager();
+				$em->persist($document);
+				$em->flush();
+
+				/* TODO: return to group list if groupSlug is empty! */
+				return $this->redirect($this->generateUrl('KekRozsakFrontBundle_groupDocuments', array('groupSlug' => $group->getSlug())));
+			}
+		}
+
+		return array(
+			'defaultGroup' => $groupSlug,
+			'form'         => $form->createView(),
+		);
+	}
+
+	/**
+	 * @Route("/dokumentum/{documentSlug}/szerkesztes", name="KekRozsakFrontBundle_documentEdit")
+	 * @Template()
+	 */
+	public function editAction($documentSlug)
+	{
+		$documentRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:Document');
+		if (!($document = $documentRepo->findOneBySlug($documentSlug)))
+			throw $this->createNotFoundException('A kért dokumentum nem létezik!');
+		$form = $this->createForm(new DocumentType(), $document);
+		$request = $this->getRequest();
+
+		if ($request->getMethod() == 'POST')
+		{
+			$form->bindRequest($request);
+			if ($form->isValid())
+			{
+				$slugifier = new Slugifier();
+				$document->setSlug($slugifier->slugify($document->getTitle()));
+				// TODO: add updatedAt, updatedBy, updateReason, etc.
+
+				$em = $this->getDoctrine()->getEntityManager();
+				$em->persist($document);
+				$em->flush();
+
+				return $this->redirect($this->generateUrl('KekRozsakFrontBundle_documentView', array('documentSlug' => $document->getSlug())));
+			}
+		}
+
+		return array(
+			'document' => $document,
+			'form'     => $form->createView(),
+		);
+	}
 }
diff --git a/src/KekRozsak/FrontBundle/Entity/Document.php b/src/KekRozsak/FrontBundle/Entity/Document.php
index fc7905e..9026d3b 100644
--- a/src/KekRozsak/FrontBundle/Entity/Document.php
+++ b/src/KekRozsak/FrontBundle/Entity/Document.php
@@ -4,6 +4,8 @@ namespace KekRozsak\FrontBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Bridge\Doctrine\Validator\Constraints as DoctrineAssert;
 
 use KekRozsak\SecurityBundle\Entity\User;
 use KekRozsak\FrontBundle\Entity\Group;
@@ -12,6 +14,8 @@ use KekRozsak\FrontBundle\Entity\Group;
  * KekRozsak\FrontBundle\Entity\Document
  * @ORM\Entity
  * @ORM\Table(name="documents")
+ * @DoctrineAssert\UniqueEntity(fields={"title"}, message="Ilyen című dokumentum már létezik. Kérlek válassz másikat!")
+ * @DoctrineAssert\UniqueEntity(fields={"slug"}, message="Ilyen című dokumentum már létezik. Kérlek válassz másikat!")
  */
 class Document
 {
@@ -41,6 +45,7 @@ class Document
 	/**
 	 * @var string $title
 	 * @ORM\Column(type="string", length=150, unique=true, nullable=false)
+	 * @Assert\NotBlank()
 	 */
 	protected $title;
 
@@ -69,6 +74,7 @@ class Document
 	/**
 	 * @var string $slug
 	 * @ORM\Column(type="string", length=150, unique=true, nullable=false)
+	 * @Assert\NotBlank()
 	 */
 	protected $slug;
 
@@ -207,4 +213,88 @@ class Document
 	{
 		return $this->group;
 	}
+
+	/**
+	 * @var KekRozsak\SecurityBundle\Entity\User $updatedBy
+	 * @ORM\ManyToOne(targetEntity="KekRozsak\SecurityBundle\Entity\User")
+	 */
+	protected $updatedBy;
+
+	/**
+	 * Set updatedBy
+	 *
+	 * @param KekRozsak\SecurityBundle\Entity\User $updatedBy
+	 * @return Document
+	 */
+	public function setUpdatedBy(\KekRozsak\SecurityBundle\Entity\User $updatedBy = null)
+	{
+		$this->updatedBy = $updatedBy;
+		return $this;
+	}
+
+	/**
+	 * Get updatedBy
+	 *
+	 * @return KekRozsak\SecurityBundle\Entity\User
+	 */
+	public function getUpdatedBy()
+	{
+		return $this->updatedBy;
+	}
+
+	/**
+	 * @var DateTime $updatedAt
+	 * @ORM\Column(type="datetime", nullable=true)
+	 */
+	protected $updatedAt;
+
+	/**
+	 * Set updatedAt
+	 *
+	 * @param DateTime $updatedAt
+	 * @return Document
+	 */
+	public function setUpdatedAt(\DateTime $updatedAt = null)
+	{
+		$this->updatedAt = $updatedAt;
+		return $this;
+	}
+	
+	/**
+	 * Get updatedAt
+	 *
+	 * @return DateTime
+	 */
+	public function getUpdatedAt()
+	{
+		return $this->updatedAt;
+	}
+
+	/**
+	 * @var string updateReason
+	 * @ORM\Column(type="text", nullable=true)
+	 */
+	protected $updateReason;
+	
+	/**
+	 * Set updateReason
+	 *
+	 * @param string $updateReason
+	 * @return Document
+	 */
+	public function setUpdateReason($updateReason = null)
+	{
+		$this->updateReason = $updateReason;
+		return $this;
+	}
+	
+	/**
+	 * Get updateReason
+	 *
+	 * @return string
+	 */
+	public function getUpdateReason()
+	{
+		return $this->updateReason;
+	}
 }
diff --git a/src/KekRozsak/FrontBundle/Form/Type/DocumentType.php b/src/KekRozsak/FrontBundle/Form/Type/DocumentType.php
new file mode 100644
index 0000000..d7c3068
--- /dev/null
+++ b/src/KekRozsak/FrontBundle/Form/Type/DocumentType.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace KekRozsak\FrontBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class DocumentType extends AbstractType
+{
+	public function buildForm(FormBuilderInterface $builder, array $options)
+	{
+		$builder->add('title', null, array(
+			'label' => 'A dokumentum címe',
+		));
+
+		$builder->add('content', 'ckeditor', array(
+			'label' => ' ',
+		));
+
+		/* TODO: possibility to add to other groups! */
+	}
+
+	public function getName()
+	{
+		return 'document';
+	}
+}
diff --git a/src/KekRozsak/FrontBundle/Resources/views/Document/create.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Document/create.html.twig
new file mode 100644
index 0000000..52299ff
--- /dev/null
+++ b/src/KekRozsak/FrontBundle/Resources/views/Document/create.html.twig
@@ -0,0 +1,9 @@
+{% extends '::main_template.html.twig' %}
+{% block title %} - Dokumentum létrehozása{% endblock %}
+{% block content %}
+<h3>Új dokumentum létrehozása</h3>
+<form method="post" action="{{ path('KekRozsakFrontBundle_documentCreate', { groupSlug: defaultGroup }) }}">
+	{{ form_widget(form) }}
+	<button type="submit">Mentés</button>
+</form>
+{% endblock content %}
diff --git a/src/KekRozsak/FrontBundle/Resources/views/Document/documentView.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Document/documentView.html.twig
deleted file mode 100644
index a162a2d..0000000
--- a/src/KekRozsak/FrontBundle/Resources/views/Document/documentView.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends '::main_template.html.twig' %}
-{% block title %} - Dokumentum - {{ document.title }}{% endblock %}
-{% block content %}
-<h3>{{ document.title }}</h3>
-{{ document.content }}
-<div class="szerzo">{{ document.createdBy.displayName }}</div>
-{% endblock content %}
diff --git a/src/KekRozsak/FrontBundle/Resources/views/Document/edit.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Document/edit.html.twig
new file mode 100644
index 0000000..895bb5c
--- /dev/null
+++ b/src/KekRozsak/FrontBundle/Resources/views/Document/edit.html.twig
@@ -0,0 +1,9 @@
+{% extends '::main_template.html.twig' %}
+{% block title %} - Dokumentum szerkesztése - {{ document.title }}{% endblock %}
+{% block content %}
+<h3>Dokumentum szerkesztése - {{ document.title }}</h3>
+<form method="post" action="{{ path('KekRozsakFrontBundle_documentEdit', { documentSlug: document.slug }) }}">
+	{{ form_widget(form) }}
+	<button type="submit">Mentés</button>
+</form>
+{% endblock content %}
diff --git a/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig
new file mode 100644
index 0000000..dcac593
--- /dev/null
+++ b/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig
@@ -0,0 +1,9 @@
+{% extends '::main_template.html.twig' %}
+{% block title %} - Dokumentum - {{ document.title }}{% endblock %}
+{% block content %}
+<h3>
+	{{ document.title }}{% if document.createdBy == app.user %} [ <a href="{{ path('KekRozsakFrontBundle_documentEdit', { documentSlug: document.slug }) }}">Szerkesztés</a> ] {% endif %}
+</h3>
+{{ document.content|raw }}
+<div class="szerzo">{{ document.createdBy.displayName }}</div>
+{% endblock content %}
diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/groupDocuments.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/groupDocuments.html.twig
index 2b9651e..0d85ec9 100644
--- a/src/KekRozsak/FrontBundle/Resources/views/Group/groupDocuments.html.twig
+++ b/src/KekRozsak/FrontBundle/Resources/views/Group/groupDocuments.html.twig
@@ -9,9 +9,25 @@
 	<li><a href="{{ path('KekRozsakFrontBundle_groupMembers', { groupSlug: group.slug }) }}">Tagok</a></li>
 </ul>
 <h3>{{ group.name }} - Dokumentumok</h3>
-<ul>
+<table>
+	<thead>
+		<tr>
+			<td colspan="2">Cím</td>
+			<td>Készítette</td>
+		</tr>
+	</thead>
+	<tbody>
 {% for document in group.documents %}
-	<li><a href="{{ path('KekRozsakFrontBundle_documentView', { documentSlug: document.slug }) }}">{{ document.title }}</a></li>
+		<tr>
+			<td>[ikon]</td>
+			<td><a href="{{ path('KekRozsakFrontBundle_documentView', { documentSlug: document.slug }) }}">{{ document.title }}</a></td>
+			<td>
+				{{ document.createdBy.displayName }}<br />
+				{{ document.createdAt|date('Y-m-d H:i') }}
+			</td>
+		</tr>
 {% endfor %}
-</ul>
+	</tbody>
+</table>
+<a href="{{ path('KekRozsakFrontBundle_documentCreate', { groupSlug: group.slug }) }}">Új dokumentum</a>
 {% endblock %}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index dcfbf9a..bcb77dd 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -3,7 +3,7 @@
         "name": "jms/metadata",
         "version": "1.1.1",
         "version_normalized": "1.1.1.0",
-        "time": "2011-12-29 19:32:49",
+        "time": "2011-12-29 14:32:49",
         "source": {
             "type": "git",
             "url": "https://github.com/schmittjoh/metadata",
@@ -47,7 +47,7 @@
         "name": "jms/cg",
         "version": "1.0.0",
         "version_normalized": "1.0.0.0",
-        "time": "2011-12-29 18:40:52",
+        "time": "2011-12-29 13:40:52",
         "source": {
             "type": "git",
             "url": "git://github.com/schmittjoh/cg-library.git",
@@ -89,7 +89,7 @@
         "version": "1.0.0",
         "version_normalized": "1.0.0.0",
         "target-dir": "JMS/AopBundle",
-        "time": "2011-12-29 18:50:26",
+        "time": "2011-12-29 13:50:26",
         "source": {
             "type": "git",
             "url": "https://github.com/schmittjoh/JMSAopBundle",
@@ -133,7 +133,7 @@
         "version": "1.1.0",
         "version_normalized": "1.1.0.0",
         "target-dir": "JMS/SecurityExtraBundle",
-        "time": "2011-12-29 22:38:12",
+        "time": "2011-12-29 17:38:12",
         "source": {
             "type": "git",
             "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle",
@@ -178,7 +178,7 @@
         "version": "1.0.1",
         "version_normalized": "1.0.1.0",
         "target-dir": "JMS/DiExtraBundle",
-        "time": "2012-02-24 14:01:54",
+        "time": "2012-02-24 09:01:54",
         "source": {
             "type": "git",
             "url": "https://github.com/schmittjoh/JMSDiExtraBundle",
@@ -221,7 +221,7 @@
         "name": "doctrine/common",
         "version": "2.2.2",
         "version_normalized": "2.2.2.0",
-        "time": "2012-04-06 21:46:44",
+        "time": "2012-04-06 11:46:44",
         "source": {
             "type": "git",
             "url": "https://github.com/doctrine/common",
@@ -287,7 +287,7 @@
         "name": "monolog/monolog",
         "version": "1.1.0",
         "version_normalized": "1.1.0.0",
-        "time": "2012-04-17 08:27:40",
+        "time": "2012-04-16 22:27:40",
         "source": {
             "type": "git",
             "url": "https://github.com/Seldaek/monolog.git",
@@ -337,7 +337,7 @@
         "name": "twig/extensions",
         "version": "dev-master",
         "version_normalized": "9999999-dev",
-        "time": "2012-05-15 15:28:19",
+        "time": "2012-05-15 05:28:19",
         "source": {
             "type": "git",
             "url": "https://github.com/fabpot/Twig-extensions",
@@ -378,71 +378,12 @@
             }
         }
     },
-    {
-        "name": "kriswallsmith/assetic",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "time": "2012-06-06 19:41:54",
-        "source": {
-            "type": "git",
-            "url": "http://github.com/kriswallsmith/assetic.git",
-            "reference": "d6f89a3170c5280ad554347dc113eb25fdf00ad7"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://github.com/kriswallsmith/assetic/zipball/d6f89a3170c5280ad554347dc113eb25fdf00ad7",
-            "reference": "d6f89a3170c5280ad554347dc113eb25fdf00ad7",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0",
-            "symfony/process": "2.1.*"
-        },
-        "require-dev": {
-            "twig/twig": ">=1.6.0,<2.0",
-            "leafo/lessphp": "*"
-        },
-        "suggest": {
-            "twig/twig": "Assetic provides the integration with the Twig templating engine",
-            "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler"
-        },
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.1-dev"
-            }
-        },
-        "installation-source": "source",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Kris Wallsmith",
-                "email": "kris.wallsmith@gmail.com",
-                "homepage": "http://kriswallsmith.net/",
-                "role": null
-            }
-        ],
-        "description": "Asset Management for PHP",
-        "homepage": "https://github.com/kriswallsmith/assetic",
-        "keywords": [
-            "assets",
-            "compression",
-            "minification"
-        ],
-        "autoload": {
-            "psr-0": {
-                "Assetic": "src/"
-            }
-        }
-    },
     {
         "name": "doctrine/doctrine-bundle",
         "version": "dev-master",
         "version_normalized": "9999999-dev",
         "target-dir": "Doctrine/Bundle/DoctrineBundle",
-        "time": "2012-07-02 04:42:17",
+        "time": "2012-07-01 18:42:17",
         "source": {
             "type": "git",
             "url": "git://github.com/doctrine/DoctrineBundle.git",
@@ -516,7 +457,7 @@
         "name": "doctrine/orm",
         "version": "2.2.x-dev",
         "version_normalized": "2.2.9999999.9999999-dev",
-        "time": "2012-07-06 01:48:00",
+        "time": "2012-07-05 15:48:00",
         "source": {
             "type": "git",
             "url": "git://github.com/doctrine/doctrine2.git",
@@ -581,7 +522,7 @@
         "name": "doctrine/dbal",
         "version": "2.2.x-dev",
         "version_normalized": "2.2.9999999.9999999-dev",
-        "time": "2012-07-07 12:30:35",
+        "time": "2012-07-07 02:30:35",
         "source": {
             "type": "git",
             "url": "https://github.com/doctrine/dbal",
@@ -647,7 +588,7 @@
         "version": "dev-master",
         "version_normalized": "9999999-dev",
         "target-dir": "Sensio/Bundle/GeneratorBundle",
-        "time": "2012-07-12 18:04:48",
+        "time": "2012-07-12 08:04:48",
         "source": {
             "type": "git",
             "url": "https://github.com/sensio/SensioGeneratorBundle",
@@ -695,68 +636,12 @@
             }
         }
     },
-    {
-        "name": "symfony/assetic-bundle",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "target-dir": "Symfony/Bundle/AsseticBundle",
-        "time": "2012-07-12 00:51:17",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/AsseticBundle",
-            "reference": "ed933dcfa45f00b6bc6d7727007403f3ff429e5a"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://github.com/symfony/AsseticBundle/zipball/ed933dcfa45f00b6bc6d7727007403f3ff429e5a",
-            "reference": "ed933dcfa45f00b6bc6d7727007403f3ff429e5a",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0",
-            "symfony/framework-bundle": "2.1.*",
-            "kriswallsmith/assetic": "1.1.*"
-        },
-        "suggest": {
-            "symfony/twig-bundle": "2.1.*"
-        },
-        "type": "symfony-bundle",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.1.x-dev"
-            }
-        },
-        "installation-source": "source",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Kris Wallsmith",
-                "email": "kris.wallsmith@gmail.com",
-                "homepage": "http://kriswallsmith.net/",
-                "role": null
-            }
-        ],
-        "description": "Integrates Assetic into Symfony2",
-        "homepage": "https://github.com/symfony/AsseticBundle",
-        "keywords": [
-            "assets",
-            "compression",
-            "minification"
-        ],
-        "autoload": {
-            "psr-0": {
-                "Symfony\\Bundle\\AsseticBundle": ""
-            }
-        }
-    },
     {
         "name": "symfony/monolog-bundle",
         "version": "dev-master",
         "version_normalized": "9999999-dev",
         "target-dir": "Symfony/Bundle/MonologBundle",
-        "time": "2012-06-29 23:48:07",
+        "time": "2012-06-29 13:48:07",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/MonologBundle",
@@ -816,7 +701,7 @@
         "version": "dev-master",
         "version_normalized": "9999999-dev",
         "target-dir": "Sensio/Bundle/FrameworkExtraBundle",
-        "time": "2012-07-11 17:13:52",
+        "time": "2012-07-11 07:13:52",
         "source": {
             "type": "git",
             "url": "https://github.com/sensio/SensioFrameworkExtraBundle",
@@ -861,124 +746,11 @@
             }
         }
     },
-    {
-        "name": "twig/twig",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "time": "2012-07-15 17:42:44",
-        "source": {
-            "type": "git",
-            "url": "git://github.com/fabpot/Twig.git",
-            "reference": "d45664045194ef62573c153c424508527105041e"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://github.com/fabpot/Twig/zipball/d45664045194ef62573c153c424508527105041e",
-            "reference": "d45664045194ef62573c153c424508527105041e",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.2.4"
-        },
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.9-dev"
-            }
-        },
-        "installation-source": "source",
-        "license": [
-            "BSD-3"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com",
-                "homepage": null,
-                "role": null
-            },
-            {
-                "name": "Armin Ronacher",
-                "email": "armin.ronacher@active-4.com",
-                "homepage": null,
-                "role": null
-            }
-        ],
-        "description": "Twig, the flexible, fast, and secure template language for PHP",
-        "homepage": "http://twig.sensiolabs.org",
-        "keywords": [
-            "templating"
-        ],
-        "autoload": {
-            "psr-0": {
-                "Twig_": "lib/"
-            }
-        }
-    },
-    {
-        "name": "symfony/swiftmailer-bundle",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "target-dir": "Symfony/Bundle/SwiftmailerBundle",
-        "time": "2012-07-05 05:33:34",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/SwiftmailerBundle",
-            "reference": "v2.1.0-BETA3"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://github.com/symfony/SwiftmailerBundle/zipball/v2.1.0-BETA3",
-            "reference": "v2.1.0-BETA3",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2",
-            "symfony/swiftmailer-bridge": "2.1.*",
-            "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev"
-        },
-        "require-dev": {
-            "symfony/dependency-injection": "2.1.*",
-            "symfony/http-kernel": "2.1.*",
-            "symfony/config": "2.1.*"
-        },
-        "type": "symfony-bundle",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.1-dev"
-            }
-        },
-        "installation-source": "source",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com",
-                "homepage": null,
-                "role": null
-            },
-            {
-                "name": "Symfony Community",
-                "email": null,
-                "homepage": "http://symfony.com/contributors",
-                "role": null
-            }
-        ],
-        "description": "Symfony SwiftmailerBundle",
-        "homepage": "http://symfony.com",
-        "autoload": {
-            "psr-0": {
-                "Symfony\\Bundle\\SwiftmailerBundle": ""
-            }
-        }
-    },
     {
         "name": "swiftmailer/swiftmailer",
         "version": "dev-master",
         "version_normalized": "9999999-dev",
-        "time": "2012-07-13 06:47:17",
+        "time": "2012-07-12 20:47:17",
         "source": {
             "type": "git",
             "url": "git://github.com/swiftmailer/swiftmailer.git",
@@ -1034,7 +806,7 @@
         "version": "dev-master",
         "version_normalized": "9999999-dev",
         "target-dir": "Sensio/Bundle/DistributionBundle",
-        "time": "2012-07-15 04:24:10",
+        "time": "2012-07-14 18:24:10",
         "source": {
             "type": "git",
             "url": "https://github.com/sensio/SensioDistributionBundle",
@@ -1073,12 +845,71 @@
             }
         }
     },
+    {
+        "name": "symfony/swiftmailer-bundle",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "target-dir": "Symfony/Bundle/SwiftmailerBundle",
+        "time": "2012-07-19 01:55:12",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/SwiftmailerBundle",
+            "reference": "65e6079443c3cd413012e146aa74307f18671f42"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://github.com/symfony/SwiftmailerBundle/zipball/65e6079443c3cd413012e146aa74307f18671f42",
+            "reference": "65e6079443c3cd413012e146aa74307f18671f42",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.2",
+            "symfony/swiftmailer-bridge": "2.1.*",
+            "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev"
+        },
+        "require-dev": {
+            "symfony/dependency-injection": "2.1.*",
+            "symfony/http-kernel": "2.1.*",
+            "symfony/config": "2.1.*"
+        },
+        "type": "symfony-bundle",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.1-dev"
+            }
+        },
+        "installation-source": "source",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com",
+                "homepage": null,
+                "role": null
+            },
+            {
+                "name": "Symfony Community",
+                "email": null,
+                "homepage": "http://symfony.com/contributors",
+                "role": null
+            }
+        ],
+        "description": "Symfony SwiftmailerBundle",
+        "homepage": "http://symfony.com",
+        "autoload": {
+            "psr-0": {
+                "Symfony\\Bundle\\SwiftmailerBundle": ""
+            }
+        }
+    },
     {
         "name": "egeloen/ckeditor-bundle",
         "version": "dev-master",
         "version_normalized": "9999999-dev",
         "target-dir": "Ivory/CKEditorBundle",
-        "time": "2012-05-28 13:16:47",
+        "time": "2012-05-28 11:16:47",
         "source": {
             "type": "git",
             "url": "https://github.com/egeloen/IvoryCKEditorBundle",
@@ -1118,19 +949,188 @@
         }
     },
     {
-        "name": "symfony/symfony",
+        "name": "kriswallsmith/assetic",
         "version": "dev-master",
         "version_normalized": "9999999-dev",
-        "time": "2012-07-17 09:07:53",
+        "time": "2012-07-20 10:33:33",
         "source": {
             "type": "git",
-            "url": "git://github.com/symfony/symfony.git",
-            "reference": "f52ce6178243e4b11aa09bde147f684d596fb120"
+            "url": "http://github.com/kriswallsmith/assetic.git",
+            "reference": "5c1c9b658b732a980312e8f29cec4e175c2bb6b2"
         },
         "dist": {
             "type": "zip",
-            "url": "https://github.com/symfony/symfony/zipball/f52ce6178243e4b11aa09bde147f684d596fb120",
-            "reference": "f52ce6178243e4b11aa09bde147f684d596fb120",
+            "url": "https://github.com/kriswallsmith/assetic/zipball/5c1c9b658b732a980312e8f29cec4e175c2bb6b2",
+            "reference": "5c1c9b658b732a980312e8f29cec4e175c2bb6b2",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0",
+            "symfony/process": "2.1.*"
+        },
+        "require-dev": {
+            "twig/twig": ">=1.6.0,<2.0",
+            "leafo/lessphp": "*"
+        },
+        "suggest": {
+            "twig/twig": "Assetic provides the integration with the Twig templating engine",
+            "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler"
+        },
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.1-dev"
+            }
+        },
+        "installation-source": "source",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Kris Wallsmith",
+                "email": "kris.wallsmith@gmail.com",
+                "homepage": "http://kriswallsmith.net/",
+                "role": null
+            }
+        ],
+        "description": "Asset Management for PHP",
+        "homepage": "https://github.com/kriswallsmith/assetic",
+        "keywords": [
+            "assets",
+            "compression",
+            "minification"
+        ],
+        "autoload": {
+            "psr-0": {
+                "Assetic": "src/"
+            }
+        }
+    },
+    {
+        "name": "symfony/assetic-bundle",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "target-dir": "Symfony/Bundle/AsseticBundle",
+        "time": "2012-07-20 19:34:07",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/AsseticBundle",
+            "reference": "e5e9a56a872d9e1f305d14cd8296bf77888388af"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://github.com/symfony/AsseticBundle/zipball/e5e9a56a872d9e1f305d14cd8296bf77888388af",
+            "reference": "e5e9a56a872d9e1f305d14cd8296bf77888388af",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0",
+            "symfony/framework-bundle": "2.1.*",
+            "kriswallsmith/assetic": "1.1.*"
+        },
+        "suggest": {
+            "symfony/twig-bundle": "2.1.*"
+        },
+        "type": "symfony-bundle",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.1.x-dev"
+            }
+        },
+        "installation-source": "source",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Kris Wallsmith",
+                "email": "kris.wallsmith@gmail.com",
+                "homepage": "http://kriswallsmith.net/",
+                "role": null
+            }
+        ],
+        "description": "Integrates Assetic into Symfony2",
+        "homepage": "https://github.com/symfony/AsseticBundle",
+        "keywords": [
+            "assets",
+            "compression",
+            "minification"
+        ],
+        "autoload": {
+            "psr-0": {
+                "Symfony\\Bundle\\AsseticBundle": ""
+            }
+        }
+    },
+    {
+        "name": "twig/twig",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "time": "2012-07-20 12:41:38",
+        "source": {
+            "type": "git",
+            "url": "git://github.com/fabpot/Twig.git",
+            "reference": "8a84838798e45424c5fe2d87149db6855ae037bf"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://github.com/fabpot/Twig/zipball/8a84838798e45424c5fe2d87149db6855ae037bf",
+            "reference": "8a84838798e45424c5fe2d87149db6855ae037bf",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.2.4"
+        },
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.9-dev"
+            }
+        },
+        "installation-source": "source",
+        "license": [
+            "BSD-3"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com",
+                "homepage": null,
+                "role": null
+            },
+            {
+                "name": "Armin Ronacher",
+                "email": "armin.ronacher@active-4.com",
+                "homepage": null,
+                "role": null
+            }
+        ],
+        "description": "Twig, the flexible, fast, and secure template language for PHP",
+        "homepage": "http://twig.sensiolabs.org",
+        "keywords": [
+            "templating"
+        ],
+        "autoload": {
+            "psr-0": {
+                "Twig_": "lib/"
+            }
+        }
+    },
+    {
+        "name": "symfony/symfony",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "time": "2012-07-21 11:16:18",
+        "source": {
+            "type": "git",
+            "url": "git://github.com/symfony/symfony.git",
+            "reference": "6c256b01b087f94a4ec04487d875fe81375eb6c1"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://github.com/symfony/symfony/zipball/6c256b01b087f94a4ec04487d875fe81375eb6c1",
+            "reference": "6c256b01b087f94a4ec04487d875fe81375eb6c1",
             "shasum": ""
         },
         "require": {
diff --git a/vendor/kriswallsmith/assetic/.gitignore b/vendor/kriswallsmith/assetic/.gitignore
new file mode 100644
index 0000000..192c9c6
--- /dev/null
+++ b/vendor/kriswallsmith/assetic/.gitignore
@@ -0,0 +1,4 @@
+phpunit.xml
+vendor/
+composer.phar
+composer.lock
diff --git a/vendor/kriswallsmith/assetic/composer.json b/vendor/kriswallsmith/assetic/composer.json
index a871c3e..160ac60 100644
--- a/vendor/kriswallsmith/assetic/composer.json
+++ b/vendor/kriswallsmith/assetic/composer.json
@@ -1,5 +1,6 @@
 {
     "name": "kriswallsmith/assetic",
+    "minimum-stability": "dev",
     "description": "Asset Management for PHP",
     "keywords": ["assets", "compression", "minification"],
     "homepage": "https://github.com/kriswallsmith/assetic",
@@ -20,6 +21,7 @@
         "twig/twig": ">=1.6.0,<2.0",
         "leafo/lessphp": "*"
     },
+    "minimum-stability": "dev",
     "suggest": {
         "twig/twig": "Assetic provides the integration with the Twig templating engine",
         "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler"
diff --git a/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php b/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php
index cfd6f5c..a4de031 100644
--- a/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php
+++ b/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php
@@ -25,6 +25,7 @@ use Symfony\Component\Process\ProcessBuilder;
 class CompassFilter implements FilterInterface
 {
     private $compassPath;
+    private $rubyPath;
     private $scss;
 
     // sass options
@@ -50,9 +51,10 @@ class CompassFilter implements FilterInterface
     private $generatedImagesPath;
     private $httpJavascriptsPath;
 
-    public function __construct($compassPath = '/usr/bin/compass')
+    public function __construct($compassPath = '/usr/bin/compass', $rubyPath = null)
     {
         $this->compassPath = $compassPath;
+        $this->rubyPath = $rubyPath;
         $this->cacheLocation = sys_get_temp_dir();
 
         if ('cli' !== php_sapi_name()) {
@@ -133,6 +135,11 @@ class CompassFilter implements FilterInterface
         $this->plugins[] = $plugin;
     }
 
+    public function setLoadPaths(array $loadPaths)
+    {
+        $this->loadPaths = $loadPaths;
+    }
+
     public function addLoadPath($loadPath)
     {
         $this->loadPaths[] = $loadPath;
@@ -171,11 +178,16 @@ class CompassFilter implements FilterInterface
         // compass does not seems to handle symlink, so we use realpath()
         $tempDir = realpath(sys_get_temp_dir());
 
-        $pb = new ProcessBuilder(array(
+        $compassProcessArgs = array(
             $this->compassPath,
             'compile',
             $tempDir,
-        ));
+        );
+        if (null !== $this->rubyPath) {
+            array_unshift($compassProcessArgs, $this->rubyPath);
+        }
+
+        $pb = new ProcessBuilder($compassProcessArgs);
         $pb->inheritEnvironmentVariables();
 
         if ($this->force) {
@@ -330,12 +342,12 @@ class CompassFilter implements FilterInterface
 
         // does we have an associative array ?
         if (count(array_filter(array_keys($array), "is_numeric")) != count($array)) {
-            foreach($array as $name => $value) {
+            foreach ($array as $name => $value) {
                 $output[] = sprintf('    :%s => "%s"', $name, addcslashes($value, '\\'));
             }
             $output = "{\n".implode(",\n", $output)."\n}";
         } else {
-            foreach($array as $name => $value) {
+            foreach ($array as $name => $value) {
                 $output[] = sprintf('    "%s"', addcslashes($value, '\\'));
             }
             $output = "[\n".implode(",\n", $output)."\n]";
diff --git a/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/SassFilter.php b/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/SassFilter.php
index 5a73726..364b4d8 100644
--- a/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/SassFilter.php
+++ b/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/SassFilter.php
@@ -30,6 +30,7 @@ class SassFilter implements FilterInterface
     const STYLE_COMPRESSED = 'compressed';
 
     private $sassPath;
+    private $rubyPath;
     private $unixNewlines;
     private $scss;
     private $style;
@@ -41,9 +42,10 @@ class SassFilter implements FilterInterface
     private $noCache;
     private $compass;
 
-    public function __construct($sassPath = '/usr/bin/sass')
+    public function __construct($sassPath = '/usr/bin/sass', $rubyPath = null)
     {
         $this->sassPath = $sassPath;
+        $this->rubyPath = $rubyPath;
         $this->cacheLocation = realpath(sys_get_temp_dir());
     }
 
@@ -99,7 +101,12 @@ class SassFilter implements FilterInterface
 
     public function filterLoad(AssetInterface $asset)
     {
-        $pb = new ProcessBuilder(array($this->sassPath));
+        $sassProcessArgs = array($this->sassPath);
+        if (null !== $this->rubyPath) {
+            array_unshift($sassProcessArgs, $this->rubyPath);
+        }
+
+        $pb = new ProcessBuilder($sassProcessArgs);
 
         $root = $asset->getSourceRoot();
         $path = $asset->getSourcePath();
diff --git a/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/ScssFilter.php b/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/ScssFilter.php
index 6044b84..452c6d2 100644
--- a/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/ScssFilter.php
+++ b/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/ScssFilter.php
@@ -19,9 +19,9 @@ namespace Assetic\Filter\Sass;
  */
 class ScssFilter extends SassFilter
 {
-    public function __construct($sassPath = '/usr/bin/sass')
+    public function __construct($sassPath = '/usr/bin/sass', $rubyPath = null)
     {
-        parent::__construct($sassPath);
+        parent::__construct($sassPath, $rubyPath);
 
         $this->setScss(true);
     }
diff --git a/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php b/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php
index 3d541d8..920987a 100644
--- a/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php
+++ b/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php
@@ -80,11 +80,10 @@ abstract class BaseCompressorFilter implements FilterInterface
 
         // input and output files
         $tempDir = realpath(sys_get_temp_dir());
-        $hash = substr(sha1(time().rand(11111, 99999)), 0, 7);
-        $input = $tempDir.DIRECTORY_SEPARATOR.$hash.'.'.$type;
-        $output = $tempDir.DIRECTORY_SEPARATOR.$hash.'-min.'.$type;
+        $input = tempnam($tempDir, 'YUI-IN-');
+        $output = tempnam($tempDir, 'YUI-OUT-');
         file_put_contents($input, $content);
-        $pb->add('-o')->add($output)->add($input);
+        $pb->add('-o')->add($output)->add('--type')->add($type)->add($input);
 
         $proc = $pb->getProcess();
         $code = $proc->run();
diff --git a/vendor/kriswallsmith/assetic/tests/bootstrap.php b/vendor/kriswallsmith/assetic/tests/bootstrap.php
index 767818d..f366669 100644
--- a/vendor/kriswallsmith/assetic/tests/bootstrap.php
+++ b/vendor/kriswallsmith/assetic/tests/bootstrap.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-if (!$loader = @include __DIR__.'/../vendor/.composer/autoload.php') {
+if (!$loader = @include __DIR__.'/../vendor/autoload.php') {
     die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
         'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
         'php composer.phar install'.PHP_EOL);
@@ -43,4 +43,4 @@ if (isset($_SERVER['PACKAGER'])) {
 
 if (isset($_SERVER['PACKER'])) {
     require_once $_SERVER['PACKER'];
-}
\ No newline at end of file
+}
diff --git a/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php b/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php
index 5014f21..e6399fb 100644
--- a/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php
+++ b/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php
@@ -57,7 +57,7 @@ class DumpCommand extends ContainerAwareCommand
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln(sprintf('Dumping all <comment>%s</comment> assets.', $input->getOption('env')));
-        $output->writeln(sprintf('Debug mode is <comment>%s</comment>.', $input->getOption('no-debug') ? 'off' : 'on'));
+        $output->writeln(sprintf('Debug mode is <comment>%s</comment>.', $this->am->isDebug() ? 'on' : 'off'));
         $output->writeln('');
 
         if (!$input->getOption('watch')) {
diff --git a/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/compass.xml b/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/compass.xml
index 43bbec2..5825588 100644
--- a/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/compass.xml
+++ b/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/compass.xml
@@ -22,6 +22,7 @@
         <service id="assetic.filter.compass" class="%assetic.filter.compass.class%">
             <tag name="assetic.filter" alias="compass" />
             <argument>%assetic.filter.compass.bin%</argument>
+            <argument>%assetic.ruby.bin%</argument>
             <call method="setDebugInfo"><argument>%assetic.filter.compass.debug%</argument></call>
             <call method="setStyle"><argument>%assetic.filter.compass.style%</argument></call>
             <call method="setImagesDir"><argument>%assetic.filter.compass.images_dir%</argument></call>
diff --git a/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/sass.xml b/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/sass.xml
index 2c4e931..9df1f07 100644
--- a/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/sass.xml
+++ b/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/sass.xml
@@ -15,6 +15,7 @@
         <service id="assetic.filter.sass" class="%assetic.filter.sass.class%">
             <tag name="assetic.filter" alias="sass" />
             <argument>%assetic.filter.sass.bin%</argument>
+            <argument>%assetic.ruby.bin%</argument>
             <call method="setStyle"><argument>%assetic.filter.sass.style%</argument></call>
             <call method="setCompass"><argument>%assetic.filter.sass.compass%</argument></call>
         </service>
diff --git a/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/scss.xml b/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/scss.xml
index 006c454..23e49bc 100644
--- a/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/scss.xml
+++ b/vendor/symfony/assetic-bundle/Symfony/Bundle/AsseticBundle/Resources/config/filters/scss.xml
@@ -15,6 +15,7 @@
         <service id="assetic.filter.scss" class="%assetic.filter.scss.class%">
             <tag name="assetic.filter" alias="scss" />
             <argument>%assetic.filter.scss.sass%</argument>
+            <argument>%assetic.ruby.bin%</argument>
             <call method="setStyle"><argument>%assetic.filter.scss.style%</argument></call>
             <call method="setCompass"><argument>%assetic.filter.scss.compass%</argument></call>
         </service>
diff --git a/vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/Resources/views/Collector/swiftmailer.html.twig b/vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/Resources/views/Collector/swiftmailer.html.twig
index 3c575c9..5c9ea17 100644
--- a/vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/Resources/views/Collector/swiftmailer.html.twig
+++ b/vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/Resources/views/Collector/swiftmailer.html.twig
@@ -46,7 +46,13 @@
             {% endfor %}
 
             <p>
-                <pre>{{ message.body|e('html', message.charset)|convert_encoding('UTF-8', message.charset) }}</pre>
+                <pre>
+                    {%- if message.charset %}
+                        {{- message.body|e('html', message.charset)|convert_encoding('UTF-8', message.charset) }}
+                    {%- else %}
+                        {{- message.body|e('html') }}
+                    {%- endif -%}
+                </pre>
             </p>
         {% endfor %}
     {% endif %}
diff --git a/vendor/symfony/symfony/UPGRADE-2.1.md b/vendor/symfony/symfony/UPGRADE-2.1.md
index b949f53..c8f52b8 100644
--- a/vendor/symfony/symfony/UPGRADE-2.1.md
+++ b/vendor/symfony/symfony/UPGRADE-2.1.md
@@ -13,14 +13,15 @@
     configuration (i.e. `config.yml`), merging could yield a set of base URL's
     for multiple environments.
 
- * The priorities for the built-in listeners have changed:
-
-                                       2.0         2.1
-   security.firewall   request         64          8
-   locale listener     early_request   253         255
-                       request         -1          16
-   router listener     early_request   255         128
-                       request         10          32
+  * The priorities for the built-in listeners have changed.
+ 
+    ```
+                                            2.0         2.1
+        security.firewall   kernel.request  64          8
+        locale listener     kernel.request  0           16
+        router listener     early_request   255         n/a
+                            request         0           32
+   ```
 
 ### Doctrine
 
@@ -106,7 +107,7 @@
            if ($locale = $request->attributes->get('_locale')) {
                $request->getSession()->set('_locale', $locale);
            } else {
-               $request->setDefaultLocale($request->getSession()->get('_locale', $this->defaultLocale));
+               $request->setLocale($request->getSession()->get('_locale', $this->defaultLocale));
            }
        }
 
@@ -1053,10 +1054,25 @@
     $registry->addType($registry->resolveType(new MyFormType()));
     ```
 
+  * The method `renderBlock()` of the helper for the PHP Templating component was
+    deprecated and will be removed in Symfony 2.3. You should use `block()` instead.
+
+    Before:
+
+    ```
+    <?php echo $view['form']->renderBlock('widget_attributes') ?>
+    ```
+
+    After:
+
+    ```
+    <?php echo $view['form']->block('widget_attributes') ?>
+    ```
+
 ### Validator
 
   * The methods `setMessage()`, `getMessageTemplate()` and
-    `getMessageParameters()` in the Constraint class were deprecated and will
+    `getMessageParameters()` in the `ConstraintValidator` class were deprecated and will
     be removed in Symfony 2.3.
 
     If you have implemented custom validators, you should use the
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/CHANGELOG.md
index c170225..ada3e62 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/CHANGELOG.md
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -9,3 +9,4 @@ CHANGELOG
  * DoctrineOrmTypeGuesser now guesses "collection" for array Doctrine type
  * DoctrineType now caches its choice lists in order to improve performance
  * DoctrineType now uses ManagerRegistry::getManagerForClass() if the option "em" is not set
+ * UniqueEntity validation constraint now accepts a "repositoryMethod" option that will be used to check for uniqueness instead of the default "findBy"
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
index 07a37d5..0123d22 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -12,11 +12,12 @@
 namespace Symfony\Bridge\Doctrine\Form;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Common\Persistence\Mapping\MappingException;
+use Doctrine\ORM\Mapping\MappingException as LegacyMappingException;
 use Symfony\Component\Form\FormTypeGuesserInterface;
 use Symfony\Component\Form\Guess\Guess;
 use Symfony\Component\Form\Guess\TypeGuess;
 use Symfony\Component\Form\Guess\ValueGuess;
-use Doctrine\ORM\Mapping\MappingException;
 
 class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
 {
@@ -145,6 +146,8 @@ class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
                 return $this->cache[$class] = array($em->getClassMetadata($class), $name);
             } catch (MappingException $e) {
                 // not an entity or mapped super class
+            } catch (LegacyMappingException $e) {
+                // not an entity or mapped super class, using Doctrine ORM 2.2
             }
         }
     }
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
index cc6aa38..48cbdda 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -114,7 +114,7 @@ abstract class DoctrineType extends AbstractType
             return $choiceListCache[$hash];
         };
 
-        $emFilter = function (Options $options, $em) use ($registry) {
+        $emNormalizer = function (Options $options, $em) use ($registry) {
             /* @var ManagerRegistry $registry */
             if (null !== $em) {
                 return $registry->getManager($em);
@@ -134,8 +134,8 @@ abstract class DoctrineType extends AbstractType
             'group_by'          => null,
         ));
 
-        $resolver->setFilters(array(
-            'em' => $emFilter,
+        $resolver->setNormalizers(array(
+            'em' => $emNormalizer,
         ));
     }
 
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
index 1e8c07f..93bb75c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
@@ -47,6 +47,50 @@ class UniqueValidatorTest extends DoctrineOrmTestCase
         return $registry;
     }
 
+    protected function createRepositoryMock()
+    {
+        $repository = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectRepository')
+            ->setMethods(array('findByCustom', 'find', 'findAll', 'findOneBy', 'findBy', 'getClassName'))
+            ->getMock()
+        ;
+
+        return $repository;
+    }
+
+    protected function createEntityManagerMock($repositoryMock)
+    {
+        $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')
+            ->getMock()
+        ;
+        $em->expects($this->any())
+             ->method('getRepository')
+             ->will($this->returnValue($repositoryMock))
+        ;
+
+        $classMetadata = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
+        $classMetadata
+            ->expects($this->any())
+            ->method('hasField')
+            ->will($this->returnValue(true))
+        ;
+        $refl = $this->getMockBuilder('Doctrine\Common\Reflection\StaticReflectionProperty')
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+        $refl
+            ->expects($this->any())
+            ->method('getValue')
+            ->will($this->returnValue(true))
+        ;
+        $classMetadata->reflFields = array('name' => $refl);
+        $em->expects($this->any())
+             ->method('getClassMetadata')
+             ->will($this->returnValue($classMetadata))
+        ;
+
+        return $em;
+    }
+
     protected function createMetadataFactoryMock($metadata)
     {
         $metadataFactory = $this->getMock('Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface');
@@ -69,7 +113,7 @@ class UniqueValidatorTest extends DoctrineOrmTestCase
         return $validatorFactory;
     }
 
-    public function createValidator($entityManagerName, $em, $validateClass = null, $uniqueFields = null, $errorPath = null)
+    public function createValidator($entityManagerName, $em, $validateClass = null, $uniqueFields = null, $errorPath = null, $repositoryMethod = 'findBy')
     {
         if (!$validateClass) {
             $validateClass = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity';
@@ -83,7 +127,13 @@ class UniqueValidatorTest extends DoctrineOrmTestCase
         $uniqueValidator = new UniqueEntityValidator($registry);
 
         $metadata = new ClassMetadata($validateClass);
-        $metadata->addConstraint(new UniqueEntity(array('fields' => $uniqueFields, 'em' => $entityManagerName, 'errorPath' => $errorPath)));
+        $constraint = new UniqueEntity(array(
+            'fields' => $uniqueFields,
+            'em' => $entityManagerName,
+            'errorPath' => $errorPath,
+            'repositoryMethod' => $repositoryMethod
+        ));
+        $metadata->addConstraint($constraint);
 
         $metadataFactory = $this->createMetadataFactoryMock($metadata);
         $validatorFactory = $this->createValidatorFactory($uniqueValidator);
@@ -194,6 +244,23 @@ class UniqueValidatorTest extends DoctrineOrmTestCase
         $this->assertEquals(1, $violationsList->count(), 'Violation found on entity with conflicting entity existing in the database.');
     }
 
+    public function testValidateUniquenessUsingCustomRepositoryMethod()
+    {
+        $entityManagerName = 'foo';
+        $repository = $this->createRepositoryMock();
+        $repository->expects($this->once())
+             ->method('findByCustom')
+             ->will($this->returnValue(array()))
+        ;
+        $em = $this->createEntityManagerMock($repository);
+        $validator = $this->createValidator($entityManagerName, $em, null, array(), null, 'findByCustom');
+
+        $entity1 = new SingleIdentEntity(1, 'foo');
+
+        $violationsList = $validator->validate($entity1);
+        $this->assertEquals(0, $violationsList->count(), 'Violation is using custom repository method.');
+    }
+
     /**
      * @group GH-1635
      */
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
index 55af119..ae4367f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
@@ -24,6 +24,7 @@ class UniqueEntity extends Constraint
     public $message = 'This value is already used.';
     public $service = 'doctrine.orm.validator.unique';
     public $em = null;
+    public $repositoryMethod = 'findBy';
     public $fields = array();
     public $errorPath = null;
 
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
index 13b7b25..81b68a9 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -100,7 +100,7 @@ class UniqueEntityValidator extends ConstraintValidator
         }
 
         $repository = $em->getRepository($className);
-        $result = $repository->findBy($criteria);
+        $result = $repository->{$constraint->repositoryMethod}($criteria);
 
         /* If the result is a MongoCursor, it must be advanced to the first
          * element. Rewinding should have no ill effect if $result is another
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Extension/FormExtension.php
index f77965f..f07a8a4 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Extension/FormExtension.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -12,11 +12,9 @@
 namespace Symfony\Bridge\Twig\Extension;
 
 use Symfony\Bridge\Twig\TokenParser\FormThemeTokenParser;
-use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\Exception\FormException;
+use Symfony\Bridge\Twig\Form\TwigRendererInterface;
+use Symfony\Component\Form\FormViewInterface;
 use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
-use Symfony\Component\Form\Extension\Core\View\ChoiceView;
-use Symfony\Component\Form\Util\FormUtil;
 
 /**
  * FormExtension extends Twig with form capabilities.
@@ -26,21 +24,17 @@ use Symfony\Component\Form\Util\FormUtil;
  */
 class FormExtension extends \Twig_Extension
 {
-    protected $csrfProvider;
-    protected $resources;
-    protected $blocks;
-    protected $environment;
-    protected $themes;
-    protected $varStack;
-    protected $template;
+    /**
+     * This property is public so that it can be accessed directly from compiled
+     * templates without having to call a getter, which slightly decreases performance.
+     *
+     * @var \Symfony\Component\Form\FormRendererInterface
+     */
+    public $renderer;
 
-    public function __construct(CsrfProviderInterface $csrfProvider = null, array $resources = array())
+    public function __construct(TwigRendererInterface $renderer)
     {
-        $this->csrfProvider = $csrfProvider;
-        $this->themes = new \SplObjectStorage();
-        $this->varStack = array();
-        $this->blocks = new \SplObjectStorage();
-        $this->resources = $resources;
+        $this->renderer = $renderer;
     }
 
     /**
@@ -48,25 +42,11 @@ class FormExtension extends \Twig_Extension
      */
     public function initRuntime(\Twig_Environment $environment)
     {
-        $this->environment = $environment;
+        $this->renderer->setEnvironment($environment);
     }
 
     /**
-     * Sets a theme for a given view.
-     *
-     * @param FormView     $view      A FormView instance
-     * @param array|string $resources An array of resource names|a resource name
-     */
-    public function setTheme(FormView $view, $resources)
-    {
-        $this->themes->attach($view, (array) $resources);
-        $this->blocks = new \SplObjectStorage();
-    }
-
-    /**
-     * Returns the token parser instance to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParser instances
+     * {@inheritdoc}
      */
     public function getTokenParsers()
     {
@@ -76,305 +56,39 @@ class FormExtension extends \Twig_Extension
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getFunctions()
     {
         return array(
-            'form_enctype'             => new \Twig_Function_Method($this, 'renderEnctype', array('is_safe' => array('html'))),
-            'form_widget'              => new \Twig_Function_Method($this, 'renderWidget', array('is_safe' => array('html'))),
-            'form_errors'              => new \Twig_Function_Method($this, 'renderErrors', array('is_safe' => array('html'))),
-            'form_label'               => new \Twig_Function_Method($this, 'renderLabel', array('is_safe' => array('html'))),
-            'form_row'                 => new \Twig_Function_Method($this, 'renderRow', array('is_safe' => array('html'))),
-            'form_rest'                => new \Twig_Function_Method($this, 'renderRest', array('is_safe' => array('html'))),
-            'csrf_token'               => new \Twig_Function_Method($this, 'getCsrfToken'),
-            '_form_is_choice_group'    => new \Twig_Function_Method($this, 'isChoiceGroup', array('is_safe' => array('html'))),
-            '_form_is_choice_selected' => new \Twig_Function_Method($this, 'isChoiceSelected', array('is_safe' => array('html'))),
+            'form_enctype'             => new \Twig_Function_Method($this, 'renderer->renderEnctype', array('is_safe' => array('html'))),
+            'form_widget'              => new \Twig_Function_Method($this, 'renderer->renderWidget', array('is_safe' => array('html'))),
+            'form_errors'              => new \Twig_Function_Method($this, 'renderer->renderErrors', array('is_safe' => array('html'))),
+            'form_label'               => new \Twig_Function_Method($this, 'renderer->renderLabel', array('is_safe' => array('html'))),
+            'form_row'                 => new \Twig_Function_Method($this, 'renderer->renderRow', array('is_safe' => array('html'))),
+            'form_rest'                => new \Twig_Function_Method($this, 'renderer->renderRest', array('is_safe' => array('html'))),
+            'csrf_token'               => new \Twig_Function_Method($this, 'renderer->renderCsrfToken'),
+            '_form_is_choice_group'    => new \Twig_Function_Method($this, 'renderer->isChoiceGroup', array('is_safe' => array('html'))),
+            '_form_is_choice_selected' => new \Twig_Function_Method($this, 'renderer->isChoiceSelected', array('is_safe' => array('html'))),
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getFilters()
     {
         return array(
-            'humanize' => new \Twig_Filter_Function(__NAMESPACE__.'\humanize'),
+            'humanize' => new \Twig_Filter_Method($this, 'renderer->humanize'),
         );
     }
 
-    public function isChoiceGroup($label)
-    {
-        return FormUtil::isChoiceGroup($label);
-    }
-
-    public function isChoiceSelected(FormView $view, ChoiceView $choice)
-    {
-        return FormUtil::isChoiceSelected($choice->getValue(), $view->getVar('value'));
-    }
-
     /**
-     * Renders the HTML enctype in the form tag, if necessary
-     *
-     * Example usage in Twig templates:
-     *
-     *     <form action="..." method="post" {{ form_enctype(form) }}>
-     *
-     * @param FormView $view The view for which to render the encoding type
-     *
-     * @return string The html markup
-     */
-    public function renderEnctype(FormView $view)
-    {
-        return $this->render($view, 'enctype');
-    }
-
-    /**
-     * Renders a row for the view.
-     *
-     * @param FormView $view      The view to render as a row
-     * @param array    $variables An array of variables
-     *
-     * @return string The html markup
-     */
-    public function renderRow(FormView $view, array $variables = array())
-    {
-        return $this->render($view, 'row', $variables);
-    }
-
-    /**
-     * Renders views which have not already been rendered.
-     *
-     * @param FormView $view      The parent view
-     * @param array    $variables An array of variables
-     *
-     * @return string The html markup
-     */
-    public function renderRest(FormView $view, array $variables = array())
-    {
-        return $this->render($view, 'rest', $variables);
-    }
-
-    /**
-     * Renders the HTML for a given view
-     *
-     * Example usage in Twig:
-     *
-     *     {{ form_widget(view) }}
-     *
-     * You can pass options during the call:
-     *
-     *     {{ form_widget(view, {'attr': {'class': 'foo'}}) }}
-     *
-     *     {{ form_widget(view, {'separator': '+++++'}) }}
-     *
-     * @param FormView $view      The view to render
-     * @param array    $variables Additional variables passed to the template
-     *
-     * @return string The html markup
-     */
-    public function renderWidget(FormView $view, array $variables = array())
-    {
-        return $this->render($view, 'widget', $variables);
-    }
-
-    /**
-     * Renders the errors of the given view
-     *
-     * @param FormView $view The view to render the errors for
-     *
-     * @return string The html markup
-     */
-    public function renderErrors(FormView $view)
-    {
-        return $this->render($view, 'errors');
-    }
-
-    /**
-     * Renders the label of the given view
-     *
-     * @param FormView $view      The view to render the label for
-     * @param string   $label     Label name
-     * @param array    $variables Additional variables passed to the template
-     *
-     * @return string The html markup
-     */
-    public function renderLabel(FormView $view, $label = null, array $variables = array())
-    {
-        if ($label !== null) {
-            $variables += array('label' => $label);
-        }
-
-        return $this->render($view, 'label', $variables);
-    }
-
-    /**
-     * Renders a template.
-     *
-     * 1. This function first looks for a block named "_<view id>_<section>",
-     * 2. if such a block is not found the function will look for a block named
-     *    "<type name>_<section>",
-     * 3. the type name is recursively replaced by the parent type name until a
-     *    corresponding block is found
-     *
-     * @param FormView $view      The form view
-     * @param string   $section   The section to render (i.e. 'row', 'widget', 'label', ...)
-     * @param array    $variables Additional variables
-     *
-     * @return string The html markup
-     *
-     * @throws FormException if no template block exists to render the given section of the view
-     */
-    protected function render(FormView $view, $section, array $variables = array())
-    {
-        $mainTemplate = in_array($section, array('widget', 'row'));
-
-        if ($mainTemplate && $view->isRendered()) {
-            return '';
-        }
-
-        if (null === $this->template) {
-            $this->template = reset($this->resources);
-            if (!$this->template instanceof \Twig_Template) {
-                $this->template = $this->environment->loadTemplate($this->template);
-            }
-        }
-
-        $custom = '_'.$view->getVar('id');
-        $rendering = $custom.$section;
-        $blocks = $this->getBlocks($view);
-
-        if (isset($this->varStack[$rendering])) {
-            $typeIndex = $this->varStack[$rendering]['typeIndex'] - 1;
-            $types = $this->varStack[$rendering]['types'];
-            $this->varStack[$rendering]['variables'] = array_replace_recursive($this->varStack[$rendering]['variables'], $variables);
-        } else {
-            $types = $view->getVar('types');
-            $types[] = $view->getVar('full_block_name');
-            $typeIndex = count($types) - 1;
-            $this->varStack[$rendering] = array(
-                'variables' => array_replace_recursive($view->getVars(), $variables),
-                'types'     => $types,
-            );
-        }
-
-        do {
-            $types[$typeIndex] .= '_'.$section;
-
-            if (isset($blocks[$types[$typeIndex]])) {
-                $this->varStack[$rendering]['typeIndex'] = $typeIndex;
-
-                $context = $this->environment->mergeGlobals($this->varStack[$rendering]['variables']);
-
-                // we do not call renderBlock here to avoid too many nested level calls (XDebug limits the level to 100 by default)
-                ob_start();
-                $this->template->displayBlock($types[$typeIndex], $context, $blocks);
-                $html = ob_get_clean();
-
-                if ($mainTemplate) {
-                    $view->setRendered();
-                }
-
-                unset($this->varStack[$rendering]);
-
-                return $html;
-            }
-        } while (--$typeIndex >= 0);
-
-        throw new FormException(sprintf(
-            'Unable to render the form as none of the following blocks exist: "%s".',
-            implode('", "', array_reverse($types))
-        ));
-    }
-
-    /**
-     * Returns a CSRF token.
-     *
-     * Use this helper for CSRF protection without the overhead of creating a
-     * form.
-     *
-     * <code>
-     * <input type="hidden" name="token" value="{{ csrf_token('rm_user_' ~ user.id) }}">
-     * </code>
-     *
-     * Check the token in your action using the same intention.
-     *
-     * <code>
-     * $csrfProvider = $this->get('form.csrf_provider');
-     * if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
-     *     throw new \RuntimeException('CSRF attack detected.');
-     * }
-     * </code>
-     *
-     * @param string $intention The intention of the protected action
-     *
-     * @return string A CSRF token
-     */
-    public function getCsrfToken($intention)
-    {
-        if (!$this->csrfProvider instanceof CsrfProviderInterface) {
-            throw new \BadMethodCallException('CSRF token can only be generated if a CsrfProviderInterface is injected in the constructor.');
-        }
-
-        return $this->csrfProvider->generateCsrfToken($intention);
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
+     * {@inheritdoc}
      */
     public function getName()
     {
         return 'form';
     }
-
-    /**
-     * Returns the blocks used to render the view.
-     *
-     * Templates are looked for in the resources in the following order:
-     *   * resources from the themes (and its parents)
-     *   * resources from the themes of parent views (up to the root view)
-     *   * default resources
-     *
-     * @param FormView $view The view
-     *
-     * @return array An array of Twig_TemplateInterface instances
-     */
-    protected function getBlocks(FormView $view)
-    {
-        if (!$this->blocks->contains($view)) {
-            $rootView = !$view->hasParent();
-
-            $templates = $rootView ? $this->resources : array();
-
-            if (isset($this->themes[$view])) {
-                $templates = array_merge($templates, $this->themes[$view]);
-            }
-
-            $blocks = array();
-
-            foreach ($templates as $template) {
-                if (!$template instanceof \Twig_Template) {
-                    $template = $this->environment->loadTemplate($template);
-                }
-
-                $templateBlocks = array();
-                do {
-                    $templateBlocks = array_merge($template->getBlocks(), $templateBlocks);
-                } while (false !== $template = $template->getParent(array()));
-                $blocks = array_merge($blocks, $templateBlocks);
-            }
-
-            if (!$rootView) {
-                $blocks = array_merge($this->getBlocks($view->getParent()), $blocks);
-            }
-
-            $this->blocks->attach($view, $blocks);
-        } else {
-            $blocks = $this->blocks[$view];
-        }
-
-        return $blocks;
-    }
-}
-
-function humanize($text)
-{
-    return ucfirst(trim(strtolower(preg_replace('/[_\s]+/', ' ', $text))));
 }
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRenderer.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRenderer.php
new file mode 100644
index 0000000..72798d1
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRenderer.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Form;
+
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class TwigRenderer extends FormRenderer implements TwigRendererInterface
+{
+    /**
+     * @var TwigRendererEngineInterface
+     */
+    private $engine;
+
+    public function __construct(TwigRendererEngineInterface $engine, CsrfProviderInterface $csrfProvider = null)
+    {
+        parent::__construct($engine, $csrfProvider);
+
+        $this->engine = $engine;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setEnvironment(\Twig_Environment $environment)
+    {
+        $this->engine->setEnvironment($environment);
+    }
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
new file mode 100644
index 0000000..22d3688
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
@@ -0,0 +1,183 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Form;
+
+use Symfony\Component\Form\AbstractRendererEngine;
+use Symfony\Component\Form\FormViewInterface;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class TwigRendererEngine extends AbstractRendererEngine implements TwigRendererEngineInterface
+{
+    /**
+     * @var \Twig_Environment
+     */
+    private $environment;
+
+    /**
+     * @var \Twig_Template
+     */
+    private $template;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setEnvironment(\Twig_Environment $environment)
+    {
+        $this->environment = $environment;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderBlock(FormViewInterface $view, $resource, $block, array $variables = array())
+    {
+        $cacheKey = $view->getVar(self::CACHE_KEY_VAR);
+
+        $context = $this->environment->mergeGlobals($variables);
+
+        ob_start();
+
+        // By contract,This method can only be called after getting the resource
+        // (which is passed to the method). Getting a resource for the first time
+        // (with an empty cache) is guaranteed to invoke loadResourcesFromTheme(),
+        // where the property $template is initialized.
+
+        // We do not call renderBlock here to avoid too many nested level calls
+        // (XDebug limits the level to 100 by default)
+        $this->template->displayBlock($block, $context, $this->resources[$cacheKey]);
+
+        return ob_get_clean();
+    }
+
+    /**
+     * Loads the cache with the resource for a given block name.
+     *
+     * This implementation eagerly loads all blocks of the themes assigned to the given view
+     * and all of its ancestors views. This is necessary, because Twig receives the
+     * list of blocks later. At that point, all blocks must already be loaded, for the
+     * case that the function "block()" is used in the Twig template.
+     *
+     * @see getResourceForBlock()
+     *
+     * @param string            $cacheKey The cache key of the form view.
+     * @param FormViewInterface $view     The form view for finding the applying themes.
+     * @param string            $block    The name of the block to load.
+     *
+     * @return Boolean True if the resource could be loaded, false otherwise.
+     */
+    protected function loadResourceForBlock($cacheKey, FormViewInterface $view, $block)
+    {
+        // The caller guarantees that $this->resources[$cacheKey][$block] is
+        // not set, but it doesn't have to check whether $this->resources[$cacheKey]
+        // is set. If $this->resources[$cacheKey] is set, all themes for this
+        // $cacheKey are already loaded (due to the eager population, see doc comment).
+        if (isset($this->resources[$cacheKey])) {
+            // As said in the previous, the caller guarantees that
+            // $this->resources[$cacheKey][$block] is not set. Since the themes are
+            // already loaded, it can only be a non-existing block.
+            $this->resources[$cacheKey][$block] = false;
+
+            return false;
+        }
+
+        // Recursively try to find the block in the themes assigned to $view,
+        // then of its parent view, then of the parent view of the parent and so on.
+        // When the root view is reached in this recursion, also the default
+        // themes are taken into account.
+
+        // Check each theme whether it contains the searched block
+        if (isset($this->themes[$cacheKey])) {
+            for ($i = count($this->themes[$cacheKey]) - 1; $i >= 0; --$i) {
+                $this->loadResourcesFromTheme($cacheKey, $this->themes[$cacheKey][$i]);
+                // CONTINUE LOADING (see doc comment)
+            }
+        }
+
+        // Check the default themes once we reach the root view without success
+        if (!$view->hasParent()) {
+            for ($i = count($this->defaultThemes) - 1; $i >= 0; --$i) {
+                $this->loadResourcesFromTheme($cacheKey, $this->defaultThemes[$i]);
+                // CONTINUE LOADING (see doc comment)
+            }
+        }
+
+        // Proceed with the themes of the parent view
+        if ($view->hasParent()) {
+            $parentCacheKey = $view->getParent()->getVar(self::CACHE_KEY_VAR);
+
+            if (!isset($this->resources[$parentCacheKey])) {
+                $this->loadResourceForBlock($parentCacheKey, $view->getParent(), $block);
+            }
+
+            // EAGER CACHE POPULATION (see doc comment)
+            foreach ($this->resources[$parentCacheKey] as $blockName => $resource) {
+                if (!isset($this->resources[$cacheKey][$blockName])) {
+                    $this->resources[$cacheKey][$blockName] = $resource;
+                }
+            }
+        }
+
+        // Even though we loaded the themes, it can happen that none of them
+        // contains the searched block
+        if (!isset($this->resources[$cacheKey][$block])) {
+            // Cache that we didn't find anything to speed up further accesses
+            $this->resources[$cacheKey][$block] = false;
+        }
+
+        return false !== $this->resources[$cacheKey][$block];
+    }
+
+    /**
+     * Loads the resources for all blocks in a theme.
+     *
+     * @param string $cacheKey The cache key for storing the resource.
+     * @param mixed  $theme    The theme to load the block from. This parameter
+     *                         is passed by reference, because it might be necessary
+     *                         to initialize the theme first. Any changes made to
+     *                         this variable will be kept and be available upon
+     *                         further calls to this method using the same theme.
+     */
+    protected function loadResourcesFromTheme($cacheKey, &$theme)
+    {
+        if (!$theme instanceof \Twig_Template) {
+            /* @var \Twig_Template $theme */
+            $theme = $this->environment->loadTemplate($theme);
+        }
+
+        if (null === $this->template) {
+            // Store the first \Twig_Template instance that we find so that
+            // we can call displayBlock() later on. It doesn't matter *which*
+            // template we use for that, since we pass the used blocks manually
+            // anyway.
+            $this->template = $theme;
+        }
+
+        // Use a separate variable for the inheritance traversal, because
+        // theme is a reference and we don't want to change it.
+        $currentTheme = $theme;
+
+        // The do loop takes care of template inheritance.
+        // Add blocks from all templates in the inheritance tree, but avoid
+        // overriding blocks already set.
+        do {
+            foreach ($currentTheme->getBlocks() as $block => $blockData) {
+                if (!isset($this->resources[$cacheKey][$block])) {
+                    // The resource given back is the key to the bucket that
+                    // contains this block.
+                    $this->resources[$cacheKey][$block] = $blockData;
+                }
+            }
+        } while (false !== $currentTheme = $currentTheme->getParent(array()));
+    }
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererEngineInterface.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererEngineInterface.php
new file mode 100644
index 0000000..ef764a2
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererEngineInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Form;
+
+use Symfony\Component\Form\FormRendererEngineInterface;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+interface TwigRendererEngineInterface extends FormRendererEngineInterface
+{
+    /**
+     * Sets Twig's environment.
+     *
+     * @param \Twig_Environment $environment
+     */
+    public function setEnvironment(\Twig_Environment $environment);
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererInterface.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererInterface.php
new file mode 100644
index 0000000..4682f52
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Form/TwigRendererInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Form;
+
+use Symfony\Component\Form\FormRendererInterface;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+interface TwigRendererInterface extends FormRendererInterface
+{
+    /**
+     * Sets Twig's environment.
+     *
+     * @param \Twig_Environment $environment
+     */
+    public function setEnvironment(\Twig_Environment $environment);
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Node/FormThemeNode.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
index c6fe132..329ab86 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
@@ -30,7 +30,7 @@ class FormThemeNode extends \Twig_Node
     {
         $compiler
             ->addDebugInfo($this)
-            ->write('echo $this->env->getExtension(\'form\')->setTheme(')
+            ->write('$this->env->getExtension(\'form\')->renderer->setTheme(')
             ->subcompile($this->getNode('form'))
             ->raw(', ')
             ->subcompile($this->getNode('resources'))
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
index c2f8ed1..f057a51 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Bridge\Twig\Tests\Extension;
 
 use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Form\TwigRenderer;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
 use Symfony\Bridge\Twig\Extension\TranslationExtension;
 use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
 use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
@@ -20,6 +22,9 @@ use Symfony\Component\Form\Tests\AbstractDivLayoutTest;
 
 class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
 {
+    /**
+     * @var FormExtension
+     */
     protected $extension;
 
     protected function setUp()
@@ -42,20 +47,23 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
 
         parent::setUp();
 
-        $loader = new StubFilesystemLoader(array(
-            __DIR__.'/../../../../../../src/Symfony/Bridge/Twig/Resources/views/Form',
-            __DIR__,
-        ));
-
-        $this->extension = new FormExtension($this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'), array(
+        $rendererEngine = new TwigRendererEngine(array(
             'form_div_layout.html.twig',
             'custom_widgets.html.twig',
         ));
+        $renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'));
+
+        $this->extension = new FormExtension($renderer);
+
+        $loader = new StubFilesystemLoader(array(
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__,
+        ));
 
         $environment = new \Twig_Environment($loader, array('strict_variables' => true));
-        $environment->addExtension($this->extension);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addGlobal('global', '');
+        $environment->addExtension($this->extension);
 
         $this->extension->initRuntime($environment);
     }
@@ -99,37 +107,37 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
 
     protected function renderEnctype(FormView $view)
     {
-        return (string) $this->extension->renderEnctype($view);
+        return (string) $this->extension->renderer->renderEnctype($view);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())
     {
-        return (string) $this->extension->renderLabel($view, $label, $vars);
+        return (string) $this->extension->renderer->renderLabel($view, $label, $vars);
     }
 
     protected function renderErrors(FormView $view)
     {
-        return (string) $this->extension->renderErrors($view);
+        return (string) $this->extension->renderer->renderErrors($view);
     }
 
     protected function renderWidget(FormView $view, array $vars = array())
     {
-        return (string) $this->extension->renderWidget($view, $vars);
+        return (string) $this->extension->renderer->renderWidget($view, $vars);
     }
 
     protected function renderRow(FormView $view, array $vars = array())
     {
-        return (string) $this->extension->renderRow($view, $vars);
+        return (string) $this->extension->renderer->renderRow($view, $vars);
     }
 
     protected function renderRest(FormView $view, array $vars = array())
     {
-        return (string) $this->extension->renderRest($view, $vars);
+        return (string) $this->extension->renderer->renderRest($view, $vars);
     }
 
     protected function setTheme(FormView $view, array $themes)
     {
-        $this->extension->setTheme($view, $themes);
+        $this->extension->renderer->setTheme($view, $themes);
     }
 
     public static function themeBlockInheritanceProvider()
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
index dc979b9..effca09 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Bridge\Twig\Tests\Extension;
 
 use Symfony\Component\Form\FormView;
+use Symfony\Bridge\Twig\Form\TwigRenderer;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
 use Symfony\Bridge\Twig\Extension\FormExtension;
 use Symfony\Bridge\Twig\Extension\TranslationExtension;
 use Symfony\Component\Form\Tests\AbstractTableLayoutTest;
@@ -20,6 +22,9 @@ use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
 
 class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
 {
+    /**
+     * @var FormExtension
+     */
     protected $extension;
 
     protected function setUp()
@@ -42,20 +47,23 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
 
         parent::setUp();
 
-        $loader = new StubFilesystemLoader(array(
-            __DIR__.'/../../../../../../src/Symfony/Bridge/Twig/Resources/views/Form',
-            __DIR__,
-        ));
-
-        $this->extension = new FormExtension($this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'), array(
+        $rendererEngine = new TwigRendererEngine(array(
             'form_table_layout.html.twig',
             'custom_widgets.html.twig',
         ));
+        $renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'));
+
+        $this->extension = new FormExtension($renderer);
+
+        $loader = new StubFilesystemLoader(array(
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__,
+        ));
 
         $environment = new \Twig_Environment($loader, array('strict_variables' => true));
-        $environment->addExtension($this->extension);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addGlobal('global', '');
+        $environment->addExtension($this->extension);
 
         $this->extension->initRuntime($environment);
     }
@@ -69,36 +77,36 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
 
     protected function renderEnctype(FormView $view)
     {
-        return (string) $this->extension->renderEnctype($view);
+        return (string) $this->extension->renderer->renderEnctype($view);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = array())
     {
-        return (string) $this->extension->renderLabel($view, $label, $vars);
+        return (string) $this->extension->renderer->renderLabel($view, $label, $vars);
     }
 
     protected function renderErrors(FormView $view)
     {
-        return (string) $this->extension->renderErrors($view);
+        return (string) $this->extension->renderer->renderErrors($view);
     }
 
     protected function renderWidget(FormView $view, array $vars = array())
     {
-        return (string) $this->extension->renderWidget($view, $vars);
+        return (string) $this->extension->renderer->renderWidget($view, $vars);
     }
 
     protected function renderRow(FormView $view, array $vars = array())
     {
-        return (string) $this->extension->renderRow($view, $vars);
+        return (string) $this->extension->renderer->renderRow($view, $vars);
     }
 
     protected function renderRest(FormView $view, array $vars = array())
     {
-        return (string) $this->extension->renderRest($view, $vars);
+        return (string) $this->extension->renderer->renderRest($view, $vars);
     }
 
     protected function setTheme(FormView $view, array $themes)
     {
-        $this->extension->setTheme($view, $themes);
+        $this->extension->renderer->setTheme($view, $themes);
     }
 }
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
index ec81f5f..90afef1 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
@@ -55,7 +55,7 @@ class FormThemeTest extends TestCase
 
         $this->assertEquals(
             sprintf(
-                'echo $this->env->getExtension(\'form\')->setTheme(%s, array(0 => "tpl1", 1 => "tpl2"));',
+                '$this->env->getExtension(\'form\')->renderer->setTheme(%s, array(0 => "tpl1", 1 => "tpl2"));',
                 $this->getVariableGetter('form')
              ),
             trim($compiler->compile($node)->getSource())
@@ -67,7 +67,7 @@ class FormThemeTest extends TestCase
 
         $this->assertEquals(
             sprintf(
-                'echo $this->env->getExtension(\'form\')->setTheme(%s, "tpl1");',
+                '$this->env->getExtension(\'form\')->renderer->setTheme(%s, "tpl1");',
                 $this->getVariableGetter('form')
              ),
             trim($compiler->compile($node)->getSource())
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php
deleted file mode 100644
index 70c7a8f..0000000
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\DataCollector;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector as BaseRequestDataCollector;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-
-/**
- * RequestDataCollector.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class RequestDataCollector extends BaseRequestDataCollector
-{
-    protected $controllers;
-
-    public function __construct()
-    {
-        $this->controllers = new \SplObjectStorage();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        parent::collect($request, $response, $exception);
-
-        $this->data['controller'] = 'n/a';
-
-        if (isset($this->controllers[$request])) {
-            $controller = $this->controllers[$request];
-            if (is_array($controller)) {
-                $r = new \ReflectionMethod($controller[0], $controller[1]);
-                $this->data['controller'] = array(
-                    'class'  => get_class($controller[0]),
-                    'method' => $controller[1],
-                    'file'   => $r->getFilename(),
-                    'line'   => $r->getStartLine(),
-                );
-            } elseif ($controller instanceof \Closure) {
-                $this->data['controller'] = 'Closure';
-            } else {
-                $this->data['controller'] = (string) $controller ?: 'n/a';
-            }
-            unset($this->controllers[$request]);
-        }
-    }
-
-    public function onKernelController(FilterControllerEvent $event)
-    {
-        $this->controllers[$event->getRequest()] = $event->getController();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRoute()
-    {
-        return isset($this->data['request_attributes']['_route']) ? $this->data['request_attributes']['_route'] : '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRouteParams()
-    {
-        return isset($this->data['request_attributes']['_route_params']) ? $this->data['request_attributes']['_route_params'] : array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getController()
-    {
-        return $this->data['controller'];
-    }
-}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
index d3956ee..8163646 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -6,7 +6,7 @@
 
     <parameters>
         <parameter key="data_collector.config.class">Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector</parameter>
-        <parameter key="data_collector.request.class">Symfony\Bundle\FrameworkBundle\DataCollector\RequestDataCollector</parameter>
+        <parameter key="data_collector.request.class">Symfony\Component\HttpKernel\DataCollector\RequestDataCollector</parameter>
         <parameter key="data_collector.exception.class">Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector</parameter>
         <parameter key="data_collector.events.class">Symfony\Component\HttpKernel\DataCollector\EventDataCollector</parameter>
         <parameter key="data_collector.logger.class">Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector</parameter>
@@ -22,7 +22,7 @@
         </service>
 
         <service id="data_collector.request" class="%data_collector.request.class%">
-            <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController"/>
+            <tag name="kernel.event_subscriber" />
             <tag name="data_collector" template="WebProfilerBundle:Collector:request" id="request" priority="255" />
         </service>
 
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
index 3d13360..ea17954 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
@@ -15,6 +15,8 @@
         <parameter key="templating.helper.code.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\CodeHelper</parameter>
         <parameter key="templating.helper.translator.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper</parameter>
         <parameter key="templating.helper.form.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper</parameter>
+        <parameter key="templating.form.engine.class">Symfony\Component\Form\Extension\Templating\TemplatingRendererEngine</parameter>
+        <parameter key="templating.form.renderer.class">Symfony\Component\Form\FormRenderer</parameter>
         <parameter key="templating.globals.class">Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables</parameter>
         <parameter key="templating.asset.path_package.class">Symfony\Bundle\FrameworkBundle\Templating\Asset\PathPackage</parameter>
         <parameter key="templating.asset.url_package.class">Symfony\Component\Templating\Asset\UrlPackage</parameter>
@@ -96,11 +98,19 @@
 
         <service id="templating.helper.form" class="%templating.helper.form.class%">
             <tag name="templating.helper" alias="form" />
+            <argument type="service" id="templating.form.renderer" />
+        </service>
+
+        <service id="templating.form.engine" class="%templating.form.engine.class%" public="false">
             <argument type="service" id="templating.engine.php" />
-            <argument type="service" id="form.csrf_provider" on-invalid="null" />
             <argument>%templating.helper.form.resources%</argument>
         </service>
 
+        <service id="templating.form.renderer" class="%templating.form.renderer.class%" public="false">
+            <argument type="service" id="templating.form.engine" />
+            <argument type="service" id="form.csrf_provider" on-invalid="null" />
+        </service>
+
         <service id="templating.globals" class="%templating.globals.class%">
             <argument type="service" id="service_container" />
         </service>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php
index 632b311..621cf9c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('widget_attributes') ?>
+<?php echo $view['form']->block('widget_attributes') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php
index fff427d..2efc537 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php
@@ -1,5 +1,5 @@
 <input type="checkbox"
-    <?php echo $view['form']->renderBlock('widget_attributes') ?>
+    <?php echo $view['form']->block('widget_attributes') ?>
     <?php if ($value): ?> value="<?php echo $view->escape($value) ?>"<?php endif ?>
     <?php if ($checked): ?> checked="checked"<?php endif ?>
 />
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_options.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_options.html.php
index eae0d92..9beb0ad 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_options.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_options.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('choice_widget_options') ?>
+<?php echo $view['form']->block('choice_widget_options') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php
index 99db4ac..66e23ef 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php
@@ -1,5 +1,5 @@
 <?php if ($expanded): ?>
-<?php echo $view['form']->renderBlock('choice_widget_expanded') ?>
+<?php echo $view['form']->block('choice_widget_expanded') ?>
 <?php else: ?>
-<?php echo $view['form']->renderBlock('choice_widget_collapsed') ?>
+<?php echo $view['form']->block('choice_widget_collapsed') ?>
 <?php endif ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
index b0c601e..dd3655b 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
@@ -1,13 +1,13 @@
 <select
-    <?php echo $view['form']->renderBlock('widget_attributes') ?>
+    <?php echo $view['form']->block('widget_attributes') ?>
     <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
 >
     <?php if (null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value, array(), $translation_domain)) ?></option><?php endif; ?>
     <?php if (count($preferred_choices) > 0): ?>
-        <?php echo $view['form']->renderBlock('choice_widget_options', array('options' => $preferred_choices)) ?>
+        <?php echo $view['form']->block('choice_widget_options', array('options' => $preferred_choices)) ?>
         <?php if (count($choices) > 0 && null !== $separator): ?>
             <option disabled="disabled"><?php echo $separator ?></option>
         <?php endif ?>
     <?php endif ?>
-    <?php echo $view['form']->renderBlock('choice_widget_options', array('options' => $choices)) ?>
+    <?php echo $view['form']->block('choice_widget_options', array('options' => $choices)) ?>
 </select>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_expanded.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_expanded.html.php
index 58de38d..b4b9a0f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_expanded.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_expanded.html.php
@@ -1,4 +1,4 @@
-<div <?php echo $view['form']->renderBlock('widget_container_attributes') ?>>
+<div <?php echo $view['form']->block('widget_container_attributes') ?>>
 <?php foreach ($form as $child): ?>
     <?php echo $view['form']->widget($child) ?>
     <?php echo $view['form']->label($child) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/container_attributes.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/container_attributes.html.php
index 3edfa44..588028b 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/container_attributes.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/container_attributes.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('widget_container_attributes') ?>
+<?php echo $view['form']->block('widget_container_attributes') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php
index 439443c..7e087be 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php
@@ -1,7 +1,7 @@
 <?php if ($widget == 'single_text'): ?>
-    <?php echo $view['form']->renderBlock('form_widget_simple'); ?>
+    <?php echo $view['form']->block('form_widget_simple'); ?>
 <?php else: ?>
-    <div <?php echo $view['form']->renderBlock('widget_container_attributes') ?>>
+    <div <?php echo $view['form']->block('widget_container_attributes') ?>>
         <?php echo str_replace(array('{{ year }}', '{{ month }}', '{{ day }}'), array(
             $view['form']->widget($form['year']),
             $view['form']->widget($form['month']),
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/datetime_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/datetime_widget.html.php
index 6864874..3685c08 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/datetime_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/datetime_widget.html.php
@@ -1,7 +1,7 @@
 <?php if ($widget == 'single_text'): ?>
-    <?php echo $view['form']->renderBlock('form_widget_simple'); ?>
+    <?php echo $view['form']->block('form_widget_simple'); ?>
 <?php else: ?>
-    <div <?php echo $view['form']->renderBlock('widget_container_attributes') ?>>
+    <div <?php echo $view['form']->block('widget_container_attributes') ?>>
         <?php echo $view['form']->widget($form['date']).' '.$view['form']->widget($form['time']) ?>
     </div>
 <?php endif ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php
index 0ef4d9d..782de8c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_widget_simple', array('type' => isset($type) ? $type : 'email')) ?>
+<?php echo $view['form']->block('form_widget_simple', array('type' => isset($type) ? $type : 'email')) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_enctype.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_enctype.html.php
index baab129..1f56ba0 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_enctype.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_enctype.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_enctype') ?>
+<?php echo $view['form']->block('form_enctype') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_errors.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_errors.html.php
index d4cbe1b..4542230 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_errors.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_errors.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_errors') ?>
+<?php echo $view['form']->block('form_errors') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php
index 71d055c..bd9fd27 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_label') ?>
+<?php echo $view['form']->block('form_label') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php
index fe9bae0..8341168 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_rest') ?>
+<?php echo $view['form']->block('form_rest') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.html.php
index 8077ff3..10c4952 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_row') ?>
+<?php echo $view['form']->block('form_row') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rows.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rows.html.php
index b9a07bc..62b69ab 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rows.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rows.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_rows') ?>
+<?php echo $view['form']->block('form_rows') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php
index 2621130..627555c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_widget_simple') ?>
+<?php echo $view['form']->block('form_widget_simple') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
index 0e63418..4695c1c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
@@ -1,5 +1,5 @@
 <?php if ($compound): ?>
-<?php echo $view['form']->renderBlock('form_widget_compound')?>
+<?php echo $view['form']->block('form_widget_compound')?>
 <?php else: ?>
-<?php echo $view['form']->renderBlock('form_widget_simple')?>
+<?php echo $view['form']->block('form_widget_simple')?>
 <?php endif ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_compound.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_compound.html.php
index 9321a69..6124d2f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_compound.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_compound.html.php
@@ -1,4 +1,4 @@
-<div <?php echo $view['form']->renderBlock('widget_container_attributes') ?>>
+<div <?php echo $view['form']->block('widget_container_attributes') ?>>
     <?php if (!$form->hasParent() && $errors): ?>
     <tr>
         <td colspan="2">
@@ -6,6 +6,6 @@
         </td>
     </tr>
     <?php endif ?>
-    <?php echo $view['form']->renderBlock('form_rows') ?>
+    <?php echo $view['form']->block('form_rows') ?>
     <?php echo $view['form']->rest($form) ?>
 </div>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_simple.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_simple.html.php
index 29649cf..203f7a4 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_simple.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_simple.html.php
@@ -1,5 +1,5 @@
 <input
     type="<?php echo isset($type) ? $view->escape($type) : 'text' ?>"
     <?php if (!empty($value)): ?>value="<?php echo $view->escape($value) ?>"<?php endif ?>
-    <?php echo $view['form']->renderBlock('widget_attributes') ?>
+    <?php echo $view['form']->block('widget_attributes') ?>
 />
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php
index 7dc71ae..120ebd1 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_widget_simple', array('type' => isset($type) ? $type : "hidden")) ?>
+<?php echo $view['form']->block('form_widget_simple', array('type' => isset($type) ? $type : "hidden")) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php
index 14000a5..aa34a0f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_widget_simple', array('type' => isset($type) ? $type : "number")) ?>
+<?php echo $view['form']->block('form_widget_simple', array('type' => isset($type) ? $type : "number")) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php
index 6c84a87..f829637 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php
@@ -1 +1 @@
-<?php echo str_replace('{{ widget }}', $view['form']->renderBlock('form_widget_simple'), $money_pattern) ?>
+<?php echo str_replace('{{ widget }}', $view['form']->block('form_widget_simple'), $money_pattern) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php
index c3344d8..6fa4aa4 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_widget_simple',  array('type' => isset($type) ? $type : "text")) ?>
+<?php echo $view['form']->block('form_widget_simple',  array('type' => isset($type) ? $type : "text")) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php
index ab0bcaf..463b39e 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_widget_simple',  array('type' => isset($type) ? $type : "password")) ?>
+<?php echo $view['form']->block('form_widget_simple',  array('type' => isset($type) ? $type : "password")) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php
index 38b51c0..36bc2a1 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_widget_simple',  array('type' => isset($type) ? $type : "text")) ?> %
+<?php echo $view['form']->block('form_widget_simple',  array('type' => isset($type) ? $type : "text")) ?> %
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_widget.html.php
index 3ecad14..024ca8c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_widget.html.php
@@ -1,5 +1,5 @@
 <input type="radio"
-    <?php echo $view['form']->renderBlock('widget_attributes') ?>
+    <?php echo $view['form']->block('widget_attributes') ?>
     value="<?php echo $view->escape($value) ?>"
     <?php if ($checked): ?> checked="checked"<?php endif ?>
 />
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php
index b9a07bc..62b69ab 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_rows') ?>
+<?php echo $view['form']->block('form_rows') ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php
index e071e95..04cd5a5 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_widget_simple',  array('type' => isset($type) ? $type : "search")) ?>
+<?php echo $view['form']->block('form_widget_simple',  array('type' => isset($type) ? $type : "search")) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_widget.html.php
index a82744b..5973706 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_widget.html.php
@@ -1 +1 @@
-<textarea <?php echo $view['form']->renderBlock('widget_attributes') ?>><?php echo $view->escape($value) ?></textarea>
+<textarea <?php echo $view['form']->block('widget_attributes') ?>><?php echo $view->escape($value) ?></textarea>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php
index fb7f94c..9483561 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php
@@ -1,7 +1,7 @@
 <?php if ($widget == 'single_text'): ?>
-    <?php echo $view['form']->renderBlock('form_widget_simple'); ?>
+    <?php echo $view['form']->block('form_widget_simple'); ?>
 <?php else: ?>
-    <div <?php echo $view['form']->renderBlock('widget_container_attributes') ?>>
+    <div <?php echo $view['form']->block('widget_container_attributes') ?>>
         <?php
             // There should be no spaces between the colons and the widgets, that's why
             // this block is written in a single PHP tag
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php
index d88767b..dd7c87b 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->renderBlock('form_widget_simple',  array('type' => isset($type) ? $type : "url")) ?>
+<?php echo $view['form']->block('form_widget_simple',  array('type' => isset($type) ? $type : "url")) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_widget_compound.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_widget_compound.html.php
index b022830..d4d0d08 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_widget_compound.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_widget_compound.html.php
@@ -1,7 +1,7 @@
-<table <?php echo $view['form']->renderBlock('widget_container_attributes') ?>>
+<table <?php echo $view['form']->block('widget_container_attributes') ?>>
     <?php if (!$form->hasParent()): ?>
     <?php echo $view['form']->errors($form) ?>
     <?php endif ?>
-    <?php echo $view['form']->renderBlock('form_rows') ?>
+    <?php echo $view['form']->block('form_rows') ?>
     <?php echo $view['form']->rest($form) ?>
 </table>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
index a2b5afc..b82f6ef 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -12,8 +12,9 @@
 namespace Symfony\Bundle\FrameworkBundle\Templating\Helper;
 
 use Symfony\Component\Templating\Helper\Helper;
+use Symfony\Component\Form\FormRendererInterface;
+use Symfony\Component\Form\FormViewInterface;
 use Symfony\Component\Templating\EngineInterface;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
@@ -27,46 +28,35 @@ use Symfony\Component\Form\Util\FormUtil;
  */
 class FormHelper extends Helper
 {
-    protected $engine;
-
-    protected $csrfProvider;
-
-    protected $varStack;
-
-    protected $context;
-
-    protected $resources;
-
-    protected $themes;
-
-    protected $templates;
+    /**
+     * @var FormRendererInterface
+     */
+    private $renderer;
 
     /**
-     * Constructor.
-     *
-     * @param EngineInterface       $engine       The templating engine
-     * @param CsrfProviderInterface $csrfProvider The CSRF provider
-     * @param array                 $resources    An array of theme names
+     * @param FormRendererInterface $renderer
      */
-    public function __construct(EngineInterface $engine, CsrfProviderInterface $csrfProvider = null, array $resources = array())
+    public function __construct(FormRendererInterface $renderer)
     {
-        $this->engine = $engine;
-        $this->csrfProvider = $csrfProvider;
-        $this->resources = $resources;
-        $this->varStack = array();
-        $this->context = array();
-        $this->templates = array();
-        $this->themes = array();
+        $this->renderer = $renderer;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'form';
     }
 
     public function isChoiceGroup($label)
     {
-        return FormUtil::isChoiceGroup($label);
+        return $this->renderer->isChoiceGroup($label);
     }
 
-    public function isChoiceSelected(FormView $view, ChoiceView $choice)
+    public function isChoiceSelected(FormViewInterface $view, ChoiceView $choice)
     {
-        return FormUtil::isChoiceSelected($choice->getValue(), $view->getVar('value'));
+        return $this->renderer->isChoiceSelected($view, $choice);
     }
 
     /**
@@ -74,13 +64,12 @@ class FormHelper extends Helper
      *
      * The theme format is "<Bundle>:<Controller>".
      *
-     * @param FormView     $view   A FormView instance
+     * @param FormViewInterface     $view   A FormViewInterface instance
      * @param string|array $themes A theme or an array of theme
      */
-    public function setTheme(FormView $view, $themes)
+    public function setTheme(FormViewInterface $view, $themes)
     {
-        $this->themes[$view->getVar('id')] = (array) $themes;
-        $this->templates = array();
+        $this->renderer->setTheme($view, $themes);
     }
 
     /**
@@ -90,13 +79,13 @@ class FormHelper extends Helper
      *
      *     <form action="..." method="post" <?php echo $view['form']->enctype() ?>>
      *
-     * @param FormView $view The view for which to render the encoding type
+     * @param FormViewInterface $view The view for which to render the encoding type
      *
-     * @return string The html markup
+     * @return string The HTML markup
      */
-    public function enctype(FormView $view)
+    public function enctype(FormViewInterface $view)
     {
-        return $this->renderSection($view, 'enctype');
+        return $this->renderer->renderEnctype($view);
     }
 
     /**
@@ -112,70 +101,95 @@ class FormHelper extends Helper
      *
      *     <?php echo view['form']->widget(array('separator' => '+++++)) ?>
      *
-     * @param FormView $view      The view for which to render the widget
-     * @param array    $variables Additional variables passed to the template
+     * @param FormViewInterface $view      The view for which to render the widget
+     * @param array             $variables Additional variables passed to the template
      *
-     * @return string The html markup
+     * @return string The HTML markup
      */
-    public function widget(FormView $view, array $variables = array())
+    public function widget(FormViewInterface $view, array $variables = array())
     {
-        return $this->renderSection($view, 'widget', $variables);
+        return $this->renderer->renderWidget($view, $variables);
     }
 
     /**
      * Renders the entire form field "row".
      *
-     * @param FormView $view      The view for which to render the row
-     * @param array    $variables Additional variables passed to the template
+     * @param FormViewInterface $view      The view for which to render the row
+     * @param array             $variables Additional variables passed to the template
      *
-     * @return string The html markup
+     * @return string The HTML markup
      */
-    public function row(FormView $view, array $variables = array())
+    public function row(FormViewInterface $view, array $variables = array())
     {
-        return $this->renderSection($view, 'row', $variables);
+        return $this->renderer->renderRow($view, $variables);
     }
 
     /**
      * Renders the label of the given view.
      *
-     * @param FormView $view      The view for which to render the label
-     * @param string   $label     The label
-     * @param array    $variables Additional variables passed to the template
+     * @param FormViewInterface $view      The view for which to render the label
+     * @param string            $label     The label
+     * @param array             $variables Additional variables passed to the template
      *
-     * @return string The html markup
+     * @return string The HTML markup
      */
-    public function label(FormView $view, $label = null, array $variables = array())
+    public function label(FormViewInterface $view, $label = null, array $variables = array())
     {
-        if ($label !== null) {
-            $variables += array('label' => $label);
-        }
-
-        return $this->renderSection($view, 'label', $variables);
+        return $this->renderer->renderLabel($view, $label, $variables);
     }
 
     /**
      * Renders the errors of the given view.
      *
-     * @param FormView $view The view to render the errors for
+     * @param FormViewInterface $view The view to render the errors for
      *
-     * @return string The html markup
+     * @return string The HTML markup
      */
-    public function errors(FormView $view)
+    public function errors(FormViewInterface $view)
     {
-        return $this->renderSection($view, 'errors');
+        return $this->renderer->renderErrors($view);
     }
 
     /**
      * Renders views which have not already been rendered.
      *
-     * @param FormView $view      The parent view
-     * @param array    $variables An array of variables
+     * @param FormViewInterface $view      The parent view
+     * @param array             $variables An array of variables
      *
-     * @return string The html markup
+     * @return string The HTML markup
      */
-    public function rest(FormView $view, array $variables = array())
+    public function rest(FormViewInterface $view, array $variables = array())
     {
-        return $this->renderSection($view, 'rest', $variables);
+        return $this->renderer->renderRest($view, $variables);
+    }
+
+    /**
+     * Alias of {@link block()}
+     *
+     * @param string $block     The name of the block to render.
+     * @param array  $variables The variable to pass to the template.
+     *
+     * @return string The HTML markup
+     *
+     * @deprecated Deprecated since version 2.1, to be removed in 2.3. Use
+     *             {@link block()} instead.
+     */
+    public function renderBlock($block, array $variables = array())
+    {
+        return $this->block($block, $variables);
+    }
+
+    /**
+     * Renders a block of the template.
+     *
+     * @param string $block     The name of the block to render.
+     * @param array  $variables The variable to pass to the template.
+     *
+     * @return string The HTML markup
+     */
+    public function block($block, array $variables = array())
+    {
+        return $this->renderer->renderBlock($block, $variables);
     }
 
     /**
@@ -200,166 +214,16 @@ class FormHelper extends Helper
      * @param string $intention The intention of the protected action
      *
      * @return string A CSRF token
+     *
+     * @throws \BadMethodCallException When no CSRF provider was injected in the constructor.
      */
     public function csrfToken($intention)
     {
-        if (!$this->csrfProvider instanceof CsrfProviderInterface) {
-            throw new \BadMethodCallException('CSRF token can only be generated if a CsrfProviderInterface is injected in the constructor.');
-        }
-
-        return $this->csrfProvider->generateCsrfToken($intention);
-    }
-
-    /**
-     * Renders a template.
-     *
-     * 1. This function first looks for a block named "_<view id>_<section>",
-     * 2. if such a block is not found the function will look for a block named
-     *    "<type name>_<section>",
-     * 3. the type name is recursively replaced by the parent type name until a
-     *    corresponding block is found
-     *
-     * @param FormView $view      The form view
-     * @param string   $section   The section to render (i.e. 'row', 'widget', 'label', ...)
-     * @param array    $variables Additional variables
-     *
-     * @return string The html markup
-     *
-     * @throws FormException if no template block exists to render the given section of the view
-     */
-    protected function renderSection(FormView $view, $section, array $variables = array())
-    {
-        $mainTemplate = in_array($section, array('row', 'widget'));
-        if ($mainTemplate && $view->isRendered()) {
-
-                return '';
-        }
-
-        $template = null;
-
-        $custom = '_'.$view->getVar('id');
-        $rendering = $custom.$section;
-
-        if (isset($this->varStack[$rendering])) {
-            $typeIndex = $this->varStack[$rendering]['typeIndex'] - 1;
-            $types = $this->varStack[$rendering]['types'];
-            $variables = array_replace_recursive($this->varStack[$rendering]['variables'], $variables);
-        } else {
-            $types = $view->getVar('types');
-            $types[] = $view->getVar('full_block_name');
-            $typeIndex = count($types) - 1;
-            $variables = array_replace_recursive($view->getVars(), $variables);
-            $this->varStack[$rendering]['types'] = $types;
-        }
-
-        $this->varStack[$rendering]['variables'] = $variables;
-
-        do {
-            $types[$typeIndex] .= '_'.$section;
-            $template = $this->lookupTemplate($view, $types[$typeIndex]);
-
-            if ($template) {
-
-                $this->varStack[$rendering]['typeIndex'] = $typeIndex;
-
-                $this->context[] = array(
-                    'variables' => $variables,
-                    'view'      => $view,
-                );
-
-                $html = $this->engine->render($template, $variables);
-
-                array_pop($this->context);
-                unset($this->varStack[$rendering]);
-
-                if ($mainTemplate) {
-                    $view->setRendered();
-                }
-
-                return trim($html);
-            }
-        } while (--$typeIndex >= 0);
-
-        throw new FormException(sprintf(
-            'Unable to render the form as none of the following blocks exist: "%s".',
-            implode('", "', array_reverse($types))
-        ));
-    }
-
-    /**
-     * Render a block from a form element.
-     *
-     * @param string $name
-     * @param array  $variables Additional variables (those would override the current context)
-     *
-     * @throws FormException if the block is not found
-     * @throws FormException if the method is called out of a form element (no context)
-     */
-    public function renderBlock($name, $variables = array())
-    {
-        if (0 == count($this->context)) {
-            throw new FormException(sprintf('This method should only be called while rendering a form element.', $name));
-        }
-
-        $context = end($this->context);
-
-        $template = $this->lookupTemplate($context['view'], $name);
-
-        if (false === $template) {
-            throw new FormException(sprintf('No block "%s" found while rendering the form.', $name));
-        }
-
-        $variables = array_replace_recursive($context['variables'], $variables);
-
-        return trim($this->engine->render($template, $variables));
+        return $this->renderer->renderCsrfToken($intention);
     }
 
     public function humanize($text)
     {
-        return ucfirst(trim(strtolower(preg_replace('/[_\s]+/', ' ', $text))));
-    }
-
-    public function getName()
-    {
-        return 'form';
-    }
-
-    /**
-     * Returns the name of the template to use to render the block
-     *
-     * @param FormView $view  The form view
-     * @param string   $block The name of the block
-     *
-     * @return string|Boolean The template logical name or false when no template is found
-     */
-    protected function lookupTemplate(FormView $view, $block)
-    {
-        $file = $block.'.html.php';
-        $id = $view->getVar('id');
-
-        if (!isset($this->templates[$id][$block])) {
-            $template = false;
-
-            $themes = $view->hasParent() ? array() : $this->resources;
-
-            if (isset($this->themes[$id])) {
-                $themes = array_merge($themes, $this->themes[$id]);
-            }
-
-            for ($i = count($themes) - 1; $i >= 0; --$i) {
-                if ($this->engine->exists($templateName = $themes[$i].':'.$file)) {
-                    $template = $templateName;
-                    break;
-                }
-            }
-
-            if (false === $template && $view->hasParent()) {
-                $template = $this->lookupTemplate($view->getParent(), $block);
-            }
-
-            $this->templates[$id][$block] = $template;
-        }
-
-        return $this->templates[$id][$block];
+        return $this->renderer->humanize($text);
     }
 }
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
index 7d3a6f1..f40e7b4 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -15,9 +15,11 @@ use Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper;
 use Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper;
 use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTemplateNameParser;
 use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTranslator;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Templating\PhpEngine;
 use Symfony\Component\Templating\Loader\FilesystemLoader;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\Extension\Templating\TemplatingRendererEngine;
 use Symfony\Component\Form\Tests\AbstractDivLayoutTest;
 
 class FormHelperDivLayoutTest extends AbstractDivLayoutTest
@@ -26,6 +28,8 @@ class FormHelperDivLayoutTest extends AbstractDivLayoutTest
 
     protected function setUp()
     {
+        ini_set('xdebug.max_nesting_level', 120);
+
         parent::setUp();
 
         $root = realpath(__DIR__.'/../../../Resources/views');
@@ -34,8 +38,10 @@ class FormHelperDivLayoutTest extends AbstractDivLayoutTest
         $loader = new FilesystemLoader(array());
         $engine = new PhpEngine($templateNameParser, $loader);
         $engine->addGlobal('global', '');
+        $rendererEngine = new TemplatingRendererEngine($engine, array('FrameworkBundle:Form'));
+        $renderer = new FormRenderer($rendererEngine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'));
 
-        $this->helper = new FormHelper($engine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'), array('FrameworkBundle:Form'));
+        $this->helper = new FormHelper($renderer);
 
         $engine->setHelpers(array(
             $this->helper,
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
index 21a2645..ad8b74e 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -16,9 +16,11 @@ use Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper;
 use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTemplateNameParser;
 use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTranslator;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\Extension\Templating\TemplatingRendererEngine;
+use Symfony\Component\Form\Tests\AbstractTableLayoutTest;
 use Symfony\Component\Templating\PhpEngine;
 use Symfony\Component\Templating\Loader\FilesystemLoader;
-use Symfony\Component\Form\Tests\AbstractTableLayoutTest;
 
 class FormHelperTableLayoutTest extends AbstractTableLayoutTest
 {
@@ -34,11 +36,13 @@ class FormHelperTableLayoutTest extends AbstractTableLayoutTest
         $loader = new FilesystemLoader(array());
         $engine = new PhpEngine($templateNameParser, $loader);
         $engine->addGlobal('global', '');
-
-        $this->helper = new FormHelper($engine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'), array(
+        $rendererEngine = new TemplatingRendererEngine($engine, array(
             'FrameworkBundle:Form',
             'FrameworkBundle:FormTable'
         ));
+        $renderer = new FormRenderer($rendererEngine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'));
+
+        $this->helper = new FormHelper($renderer);
 
         $engine->setHelpers(array(
             $this->helper,
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
index a83de65..20f62c6 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -172,7 +172,7 @@ abstract class AbstractFactory implements SecurityFactoryInterface
             return $config['success_handler'];
         }
 
-        $successHandlerId = 'security.authentication.success_handler.'.$id;
+        $successHandlerId = 'security.authentication.success_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
 
         $successHandler = $container->setDefinition($successHandlerId, new DefinitionDecorator('security.authentication.success_handler'));
         $successHandler->replaceArgument(1, array_intersect_key($config, $this->defaultSuccessHandlerOptions));
@@ -187,7 +187,7 @@ abstract class AbstractFactory implements SecurityFactoryInterface
             return $config['failure_handler'];
         }
 
-        $id = 'security.authentication.failure_handler.'.$id;
+        $id = 'security.authentication.failure_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
 
         $failureHandler = $container->setDefinition($id, new DefinitionDecorator('security.authentication.failure_handler'));
         $failureHandler->replaceArgument(2, array_intersect_key($config, $this->defaultFailureHandlerOptions));
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
index 61863b8..2bc24bc 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
@@ -54,7 +54,7 @@ class AbstractFactoryTest extends \PHPUnit_Framework_TestCase
 
         $definition = $container->getDefinition('abstract_listener.foo');
         $arguments = $definition->getArguments();
-        $this->assertEquals(new Reference('security.authentication.failure_handler.foo'), $arguments['index_6']);
+        $this->assertEquals(new Reference('security.authentication.failure_handler.foo.abstract_factory'), $arguments['index_6']);
     }
 
     public function testDefaultSuccessHandler()
@@ -67,7 +67,7 @@ class AbstractFactoryTest extends \PHPUnit_Framework_TestCase
 
         $definition = $container->getDefinition('abstract_listener.foo');
         $arguments = $definition->getArguments();
-        $this->assertEquals(new Reference('security.authentication.success_handler.foo'), $arguments['index_5']);
+        $this->assertEquals(new Reference('security.authentication.success_handler.foo.abstract_factory'), $arguments['index_5']);
     }
 
     protected function callFactory($id, $config, $userProviderId, $defaultEntryPointId)
@@ -84,6 +84,11 @@ class AbstractFactoryTest extends \PHPUnit_Framework_TestCase
             ->method('getListenerId')
             ->will($this->returnValue('abstract_listener'))
         ;
+        $factory
+            ->expects($this->any())
+            ->method('getKey')
+            ->will($this->returnValue('abstract_factory'))
+        ;
 
         $container = new ContainerBuilder();
         $container->register('auth_provider');
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 3d4a697..eae0a49 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -16,6 +16,8 @@
         <parameter key="twig.extension.routing.class">Symfony\Bridge\Twig\Extension\RoutingExtension</parameter>
         <parameter key="twig.extension.yaml.class">Symfony\Bridge\Twig\Extension\YamlExtension</parameter>
         <parameter key="twig.extension.form.class">Symfony\Bridge\Twig\Extension\FormExtension</parameter>
+        <parameter key="twig.form.engine.class">Symfony\Bridge\Twig\Form\TwigRendererEngine</parameter>
+        <parameter key="twig.form.renderer.class">Symfony\Bridge\Twig\Form\TwigRenderer</parameter>
         <parameter key="twig.translation.extractor.class">Symfony\Bridge\Twig\Translation\TwigExtractor</parameter>
         <parameter key="twig.exception_listener.class">Symfony\Component\HttpKernel\EventListener\ExceptionListener</parameter>
     </parameters>
@@ -75,10 +77,18 @@
 
         <service id="twig.extension.form" class="%twig.extension.form.class%" public="false">
             <tag name="twig.extension" />
-            <argument type="service" id="form.csrf_provider" on-invalid="null" />
+            <argument type="service" id="twig.form.renderer" />
+        </service>
+
+        <service id="twig.form.engine" class="%twig.form.engine.class%" public="false">
             <argument>%twig.form.resources%</argument>
         </service>
 
+        <service id="twig.form.renderer" class="%twig.form.renderer.class%" public="false">
+            <argument type="service" id="twig.form.engine" />
+            <argument type="service" id="form.csrf_provider" on-invalid="null" />
+        </service>
+
         <service id="twig.translation.extractor" class="%twig.translation.extractor.class%">
             <argument type="service" id="twig" />
             <tag name="translation.extractor" alias="twig" />
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
index dee250b..a7801ac 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
@@ -86,7 +86,7 @@
         margin-left: -1px;
 
         bottom: 38px;
-        border-bottom: 1px solid #fff;
+        border-bottom-width: 0;
     }
 
     .sf-toolbar-block .sf-toolbar-info:empty {
@@ -216,9 +216,9 @@
         }
 
         .sf-toolbar-block .sf-toolbar-info {
-            top: 38px;
+            top: 39px;
             bottom: auto;
-            border-top: 1px solid #fff;
+            border-top-width: 0;
             border-bottom: 1px solid #bbb;
         }
     {% endif %}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/CHANGELOG.md b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/CHANGELOG.md
index 9f8c812..536c5ac 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/CHANGELOG.md
+++ b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/CHANGELOG.md
@@ -13,4 +13,4 @@ CHANGELOG
  * added GenericEvent event class
  * added the possibility for subscribers to subscribe several times for the
    same event
- * added UnmodifiableEventDispatcher
+ * added ImmutableEventDispatcher
diff --git a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/UnmodifiableEventDispatcher.php b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
similarity index 96%
rename from vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/UnmodifiableEventDispatcher.php
rename to vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
index c7097aa..b70b81a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/UnmodifiableEventDispatcher.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\EventDispatcher;
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class UnmodifiableEventDispatcher implements EventDispatcherInterface
+class ImmutableEventDispatcher implements EventDispatcherInterface
 {
     /**
      * The proxied dispatcher.
diff --git a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/UnmodifiableEventDispatcherTest.php b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
similarity index 91%
rename from vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/UnmodifiableEventDispatcherTest.php
rename to vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
index d2502b1..6402f89 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/UnmodifiableEventDispatcherTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
@@ -12,13 +12,13 @@
 namespace Symfony\Component\EventDispatcher\Tests;
 
 use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\UnmodifiableEventDispatcher;
+use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class UnmodifiableEventDispatcherTest extends \PHPUnit_Framework_TestCase
+class ImmutableEventDispatcherTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -26,14 +26,14 @@ class UnmodifiableEventDispatcherTest extends \PHPUnit_Framework_TestCase
     private $innerDispatcher;
 
     /**
-     * @var UnmodifiableEventDispatcher
+     * @var ImmutableEventDispatcher
      */
     private $dispatcher;
 
     protected function setUp()
     {
         $this->innerDispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
-        $this->dispatcher = new UnmodifiableEventDispatcher($this->innerDispatcher);
+        $this->dispatcher = new ImmutableEventDispatcher($this->innerDispatcher);
     }
 
     public function testDispatchDelegates()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Finder/Finder.php b/vendor/symfony/symfony/src/Symfony/Component/Finder/Finder.php
index 30ca1be..489a6f8 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Finder/Finder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Finder/Finder.php
@@ -66,7 +66,7 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public static function create()
     {
-        return new self();
+        return new static();
     }
 
     /**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/AbstractRendererEngine.php b/vendor/symfony/symfony/src/Symfony/Component/Form/AbstractRendererEngine.php
new file mode 100644
index 0000000..f3b4036
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/AbstractRendererEngine.php
@@ -0,0 +1,206 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form;
+
+/**
+ * Default implementation of {@link FormRendererEngineInterface}.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+abstract class AbstractRendererEngine implements FormRendererEngineInterface
+{
+    /**
+     * The variable in {@link FormViewInterface} used as cache key.
+     */
+    const CACHE_KEY_VAR = 'full_block_name';
+    
+    /**
+     * @var array
+     */
+    protected $defaultThemes;
+
+    /**
+     * @var array
+     */
+    protected $themes = array();
+
+    /**
+     * @var array
+     */
+    protected $resources = array();
+
+    /**
+     * @var array
+     */
+    private $resourceHierarchyLevels = array();
+
+    /**
+     * Creates a new renderer engine.
+     *
+     * @param array $defaultThemes The default themes. The type of these
+     *                             themes is open to the implementation.
+     */
+    public function __construct(array $defaultThemes = array())
+    {
+        $this->defaultThemes = $defaultThemes;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setTheme(FormViewInterface $view, $themes)
+    {
+        $cacheKey = $view->getVar(self::CACHE_KEY_VAR);
+
+        // Do not cast, as casting turns objects into arrays of properties
+        $this->themes[$cacheKey] = is_array($themes) ? $themes : array($themes);
+
+        // Unset instead of resetting to an empty array, in order to allow
+        // implementations (like TwigRendererEngine) to check whether $cacheKey
+        // is set at all.
+        unset($this->resources[$cacheKey]);
+        unset($this->resourceHierarchyLevels[$cacheKey]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getResourceForBlock(FormViewInterface $view, $block)
+    {
+        $cacheKey = $view->getVar(self::CACHE_KEY_VAR);
+
+        if (!isset($this->resources[$cacheKey][$block])) {
+            $this->loadResourceForBlock($cacheKey, $view, $block);
+        }
+
+        return $this->resources[$cacheKey][$block];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getResourceForBlockHierarchy(FormViewInterface $view, array $blockHierarchy, $hierarchyLevel)
+    {
+        $cacheKey = $view->getVar(self::CACHE_KEY_VAR);
+        $block = $blockHierarchy[$hierarchyLevel];
+
+        if (!isset($this->resources[$cacheKey][$block])) {
+            $this->loadResourceForBlockHierarchy($cacheKey, $view, $blockHierarchy, $hierarchyLevel);
+        }
+
+        return $this->resources[$cacheKey][$block];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getResourceHierarchyLevel(FormViewInterface $view, array $blockHierarchy, $hierarchyLevel)
+    {
+        $cacheKey = $view->getVar(self::CACHE_KEY_VAR);
+        $block = $blockHierarchy[$hierarchyLevel];
+
+        if (!isset($this->resources[$cacheKey][$block])) {
+            $this->loadResourceForBlockHierarchy($cacheKey, $view, $blockHierarchy, $hierarchyLevel);
+        }
+
+        // If $block was previously rendered loaded with loadTemplateForBlock(), the template
+        // is cached but the hierarchy level is not. In this case, we know that the  block
+        // exists at this very hierarchy level, so we can just set it.
+        if (!isset($this->resourceHierarchyLevels[$cacheKey][$block])) {
+            $this->resourceHierarchyLevels[$cacheKey][$block] = $hierarchyLevel;
+        }
+
+        return $this->resourceHierarchyLevels[$cacheKey][$block];
+    }
+
+    /**
+     * Loads the cache with the resource for a given block name.
+     *
+     * @see getResourceForBlock()
+     *
+     * @param string            $cacheKey The cache key of the form view.
+     * @param FormViewInterface $view     The form view for finding the applying themes.
+     * @param string            $block    The name of the block to load.
+     *
+     * @return Boolean True if the resource could be loaded, false otherwise.
+     */
+    abstract protected function loadResourceForBlock($cacheKey, FormViewInterface $view, $block);
+
+    /**
+     * Loads the cache with the resource for a specific level of a block hierarchy.
+     *
+     * @see getResourceForBlockHierarchy()
+     *
+     * @param string            $cacheKey       The cache key used for storing the
+     *                                          resource.
+     * @param FormViewInterface $view           The form view for finding the applying
+     *                                          themes.
+     * @param array             $blockHierarchy The block hierarchy, with the most
+     *                                          specific block name at the end.
+     * @param integer           $hierarchyLevel The level in the block hierarchy that
+     *                                          should be loaded.
+     *
+     * @return Boolean True if the resource could be loaded, false otherwise.
+     */
+    private function loadResourceForBlockHierarchy($cacheKey, FormViewInterface $view, array $blockHierarchy, $hierarchyLevel)
+    {
+        $block = $blockHierarchy[$hierarchyLevel];
+
+        // Try to find a template for that block
+        if ($this->loadResourceForBlock($cacheKey, $view, $block)) {
+            // If loadTemplateForBlock() returns true, it was able to populate the
+            // cache. The only missing thing is to set the hierarchy level at which
+            // the template was found.
+            $this->resourceHierarchyLevels[$cacheKey][$block] = $hierarchyLevel;
+
+            return true;
+        }
+
+        if ($hierarchyLevel > 0) {
+            $parentLevel = $hierarchyLevel - 1;
+            $parentBlock = $blockHierarchy[$parentLevel];
+
+            // The next two if statements contain slightly duplicated code. This is by intention
+            // and tries to avoid execution of unnecessary checks in order to increase performance.
+
+            if (isset($this->resources[$cacheKey][$parentBlock])) {
+                // It may happen that the parent block is already loaded, but its level is not.
+                // In this case, the parent block must have been loaded by loadResourceForBlock(),
+                // which does not check the hierarchy of the block. Subsequently the block must have
+                // been found directly on the parent level.
+                if (!isset($this->resourceHierarchyLevels[$cacheKey][$parentBlock])) {
+                    $this->resourceHierarchyLevels[$cacheKey][$parentBlock] = $parentLevel;
+                }
+
+                // Cache the shortcuts for further accesses
+                $this->resources[$cacheKey][$block] = $this->resources[$cacheKey][$parentBlock];
+                $this->resourceHierarchyLevels[$cacheKey][$block] = $this->resourceHierarchyLevels[$cacheKey][$parentBlock];
+
+                return true;
+            }
+
+            if ($this->loadResourceForBlockHierarchy($cacheKey, $view, $blockHierarchy, $parentLevel)) {
+                // Cache the shortcuts for further accesses
+                $this->resources[$cacheKey][$block] = $this->resources[$cacheKey][$parentBlock];
+                $this->resourceHierarchyLevels[$cacheKey][$block] = $this->resourceHierarchyLevels[$cacheKey][$parentBlock];
+
+                return true;
+            }
+        }
+
+        // Cache the result for further accesses
+        $this->resources[$cacheKey][$block] = false;
+        $this->resourceHierarchyLevels[$cacheKey][$block] = false;
+
+        return false;
+    }
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/CHANGELOG.md b/vendor/symfony/symfony/src/Symfony/Component/Form/CHANGELOG.md
index 03290fb..279a2ba 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/CHANGELOG.md
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/CHANGELOG.md
@@ -31,7 +31,6 @@ CHANGELOG
    * ArrayToChoicesTransformer to ChoicesToValuesTransformer
    * ScalarToChoiceTransformer to ChoiceToValueTransformer
    to be consistent with the naming in ChoiceListInterface.
- * [BC BREAK] removed FormUtil::toArrayKey() and FormUtil::toArrayKeys().
    They were merged into ChoiceList and have no public equivalent anymore.
  * choice fields now throw a FormException if neither the "choices" nor the
    "choice_list" option is set
@@ -141,7 +140,7 @@ CHANGELOG
  * deprecated `hasChildren` in Form and FormBuilder in favor of `count`
  * FormBuilder now implements \IteratorAggregate
  * [BC BREAK] compound forms now always need a data mapper
- * FormBuilder now maintains the order when explicitely adding form builders as children
+ * FormBuilder now maintains the order when explicitly adding form builders as children
  * ChoiceType now doesn't add the empty value anymore if the choices already contain an empty element
  * DateType, TimeType and DateTimeType now show empty values again if not required
  * [BC BREAK] fixed rendering of errors for DateType, BirthdayType and similar ones
@@ -172,4 +171,11 @@ CHANGELOG
  * ChoiceType now caches its created choice lists to improve performance
  * [BC BREAK] Rows of a collection field cannot be themed individually anymore. All rows in the collection
    field now have the same block names, which contains "entry" where it previously contained the row index.
- * [BC BREAK] When registering a type through the DI extension, the tag alias has to match the actual type name.
\ No newline at end of file
+ * [BC BREAK] When registering a type through the DI extension, the tag alias has to match the actual type name.
+ * added FormRendererInterface, FormRendererEngineInterface and implementations of these interfaces
+ * [BC BREAK] removed the following methods from FormUtil:
+   * `toArrayKey`
+   * `toArrayKeys`
+   * `isChoiceGroup`
+   * `isChoiceSelected`
+ * added method `block` to FormHelper and deprecated `renderBlock` instead
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index bcda8d2..3f0673d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -157,7 +157,7 @@ class ChoiceType extends AbstractType
             return $options['required'] ? null : '';
         };
 
-        $emptyValueFilter = function (Options $options, $emptyValue) {
+        $emptyValueNormalizer = function (Options $options, $emptyValue) {
             if ($options['multiple'] || $options['expanded']) {
                 // never use an empty value for these cases
                 return null;
@@ -186,8 +186,8 @@ class ChoiceType extends AbstractType
             'compound'          => $compound,
         ));
 
-        $resolver->setFilters(array(
-            'empty_value' => $emptyValueFilter,
+        $resolver->setNormalizers(array(
+            'empty_value' => $emptyValueNormalizer,
         ));
 
         $resolver->setAllowedTypes(array(
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
index cc88d3a..a5e206e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -74,7 +74,7 @@ class CollectionType extends AbstractType
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $optionsFilter = function (Options $options, $value) {
+        $optionsNormalizer = function (Options $options, $value) {
             $value['block_name'] = 'entry';
 
             return $value;
@@ -89,8 +89,8 @@ class CollectionType extends AbstractType
             'options'        => array(),
         ));
 
-        $resolver->setFilters(array(
-            'options' => $optionsFilter,
+        $resolver->setNormalizers(array(
+            'options' => $optionsNormalizer,
         ));
     }
 
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index ea1b091..18a5983 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -164,7 +164,7 @@ class DateType extends AbstractType
             return $options['required'] ? null : '';
         };
 
-        $emptyValueFilter = function (Options $options, $emptyValue) use ($emptyValueDefault) {
+        $emptyValueNormalizer = function (Options $options, $emptyValue) use ($emptyValueDefault) {
             if (is_array($emptyValue)) {
                 $default = $emptyValueDefault($options);
 
@@ -216,8 +216,8 @@ class DateType extends AbstractType
             'compound'       => $compound,
         ));
 
-        $resolver->setFilters(array(
-            'empty_value' => $emptyValueFilter,
+        $resolver->setNormalizers(array(
+            'empty_value' => $emptyValueNormalizer,
         ));
 
         $resolver->setAllowedValues(array(
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index 99617dd..d06f5da 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -134,7 +134,7 @@ class TimeType extends AbstractType
             return $options['required'] ? null : '';
         };
 
-        $emptyValueFilter = function (Options $options, $emptyValue) use ($emptyValueDefault) {
+        $emptyValueNormalizer = function (Options $options, $emptyValue) use ($emptyValueDefault) {
             if (is_array($emptyValue)) {
                 $default = $emptyValueDefault($options);
 
@@ -186,8 +186,8 @@ class TimeType extends AbstractType
             'compound'       => $compound,
         ));
 
-        $resolver->setFilters(array(
-            'empty_value' => $emptyValueFilter,
+        $resolver->setNormalizers(array(
+            'empty_value' => $emptyValueNormalizer,
         ));
 
         $resolver->setAllowedValues(array(
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
index efc5fdf..0693664 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
@@ -46,7 +46,12 @@ class DependencyInjectionExtension implements FormExtensionInterface
         $type = $this->container->get($this->typeServiceIds[$name]);
 
         if ($type->getName() !== $name) {
-            throw new \InvalidArgumentException(sprintf('The type name specified for the service %s does not match the actual name', $this->typeServiceIds[$name]));
+            throw new \InvalidArgumentException(
+                sprintf('The type name specified for the service "%s" does not match the actual name. Expected "%s", given "%s"',
+                    $this->typeServiceIds[$name],
+                    $name,
+                    $type->getName()
+                ));
         }
 
         return $type;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
new file mode 100644
index 0000000..00f76e1
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Extension\Templating;
+
+use Symfony\Component\Form\AbstractRendererEngine;
+use Symfony\Component\Form\FormViewInterface;
+use Symfony\Component\Templating\EngineInterface;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class TemplatingRendererEngine extends AbstractRendererEngine
+{
+    /**
+     * @var EngineInterface
+     */
+    private $engine;
+
+    public function __construct(EngineInterface $engine, array $defaultThemes = array())
+    {
+        parent::__construct($defaultThemes);
+
+        $this->engine = $engine;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderBlock(FormViewInterface $view, $resource, $block, array $variables = array())
+    {
+        return trim($this->engine->render($resource, $variables));
+    }
+
+    /**
+     * Loads the cache with the resource for a given block name.
+     *
+     * This implementation tries to load as few blocks as possible, since each block
+     * is represented by a template on the file system.
+     *
+     * @see getResourceForBlock()
+     *
+     * @param string            $cacheKey The cache key of the form view.
+     * @param FormViewInterface $view     The form view for finding the applying themes.
+     * @param string            $block    The name of the block to load.
+     *
+     * @return Boolean True if the resource could be loaded, false otherwise.
+     */
+    protected function loadResourceForBlock($cacheKey, FormViewInterface $view, $block)
+    {
+        // Recursively try to find the block in the themes assigned to $view,
+        // then of its parent form, then of the parent form of the parent and so on.
+        // When the root form is reached in this recursion, also the default
+        // themes are taken into account.
+
+        // Check each theme whether it contains the searched block
+        if (isset($this->themes[$cacheKey])) {
+            for ($i = count($this->themes[$cacheKey]) - 1; $i >= 0; --$i) {
+                if ($this->loadResourceFromTheme($cacheKey, $block, $this->themes[$cacheKey][$i])) {
+                    return true;
+                }
+            }
+        }
+
+        // Check the default themes once we reach the root form without success
+        if (!$view->hasParent()) {
+            for ($i = count($this->defaultThemes) - 1; $i >= 0; --$i) {
+                if ($this->loadResourceFromTheme($cacheKey, $block, $this->defaultThemes[$i])) {
+                    return true;
+                }
+            }
+        }
+
+        // If we did not find anything in the themes of the current view, proceed
+        // with the themes of the parent view
+        if ($view->hasParent()) {
+            $parentCacheKey = $view->getParent()->getVar(self::CACHE_KEY_VAR);
+
+            if (!isset($this->resources[$parentCacheKey][$block])) {
+                $this->loadResourceForBlock($parentCacheKey, $view->getParent(), $block);
+            }
+
+            // If a template exists in the parent themes, cache that template
+            // for the current theme as well to speed up further accesses
+            if ($this->resources[$parentCacheKey][$block]) {
+                $this->resources[$cacheKey][$block] = $this->resources[$parentCacheKey][$block];
+
+                return true;
+            }
+        }
+
+        // Cache that we didn't find anything to speed up further accesses
+        $this->resources[$cacheKey][$block] = false;
+
+        return false;
+    }
+
+    /**
+     * Tries to load the resource for a block from a theme.
+     *
+     * @param string $cacheKey The cache key for storing the resource.
+     * @param string $block    The name of the block to load a resource for.
+     * @param mixed  $theme    The theme to load the block from.
+     *
+     * @return Boolean True if the resource could be loaded, false otherwise.
+     */
+    protected function loadResourceFromTheme($cacheKey, $block, $theme)
+    {
+        if ($this->engine->exists($templateName = $theme . ':' . $block . '.html.php')) {
+            $this->resources[$cacheKey][$block] = $templateName;
+
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
index 4b48760..f4159a5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
@@ -59,7 +59,7 @@ class FormTypeValidatorExtension extends AbstractTypeExtension
         };
 
         // Make sure that validation groups end up as null, closure or array
-        $validationGroupsFilter = function (Options $options, $groups) {
+        $validationGroupsNormalizer = function (Options $options, $groups) {
             if (empty($groups)) {
                 return null;
             }
@@ -72,7 +72,7 @@ class FormTypeValidatorExtension extends AbstractTypeExtension
         };
 
         // Constraint should always be converted to an array
-        $constraintsFilter = function (Options $options, $constraints) {
+        $constraintsNormalizer = function (Options $options, $constraints) {
             return is_object($constraints) ? array($constraints) : (array) $constraints;
         };
 
@@ -88,9 +88,9 @@ class FormTypeValidatorExtension extends AbstractTypeExtension
             'post_max_size_message' => 'The uploaded file was too large. Please try to upload a smaller file.',
         ));
 
-        $resolver->setFilters(array(
-            'validation_groups' => $validationGroupsFilter,
-            'constraints'       => $constraintsFilter,
+        $resolver->setNormalizers(array(
+            'validation_groups' => $validationGroupsNormalizer,
+            'constraints'       => $constraintsNormalizer,
         ));
     }
 
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Form.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Form.php
index e191cc9..5d6a237 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Form.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Form.php
@@ -119,6 +119,26 @@ class Form implements \IteratorAggregate, FormInterface
      */
     private $synchronized = true;
 
+    /**
+     * Whether the form's data has been initialized.
+     *
+     * When the data is initialized with its default value, that default value
+     * is passed through the transformer chain in order to synchronize the
+     * model, normalized and view format for the first time. This is done
+     * lazily in order to save performance when {@link setData()} is called
+     * manually, making the initialization with the configured default value
+     * superfluous.
+     *
+     * @var Boolean
+     */
+    private $initialized = false;
+
+    /**
+     * Whether setData() is currently being called.
+     * @var Boolean
+     */
+    private $lockSetData = false;
+
     /**
      * Creates a new form based on the given configuration.
      *
@@ -126,8 +146,8 @@ class Form implements \IteratorAggregate, FormInterface
      */
     public function __construct(FormConfigInterface $config)
     {
-        if (!$config instanceof UnmodifiableFormConfig) {
-            $config = new UnmodifiableFormConfig($config);
+        if (!$config instanceof ImmutableFormConfig) {
+            $config = new ImmutableFormConfig($config);
         }
 
         // Compound forms always need a data mapper, otherwise calls to
@@ -138,8 +158,6 @@ class Form implements \IteratorAggregate, FormInterface
         }
 
         $this->config = $config;
-
-        $this->setData($config->getData());
     }
 
     public function __clone()
@@ -152,7 +170,7 @@ class Form implements \IteratorAggregate, FormInterface
     /**
      * Returns the configuration of the form.
      *
-     * @return UnmodifiableFormConfig The form's immutable configuration.
+     * @return ImmutableFormConfig The form's immutable configuration.
      */
     public function getConfig()
     {
@@ -327,13 +345,16 @@ class Form implements \IteratorAggregate, FormInterface
     /**
      * Updates the form with default data.
      *
-     * @param array $modelData The data formatted as expected for the underlying object
+     * @param mixed $modelData The data formatted as expected for the underlying object
      *
      * @return Form The current form
      */
     public function setData($modelData)
     {
-        if ($this->bound) {
+        // If the form is bound while disabled, it is set to bound, but the data is not
+        // changed. In such cases (i.e. when the form is not initialized yet) don't
+        // abort this method.
+        if ($this->bound && $this->initialized) {
             throw new AlreadyBoundException('You cannot change the data of a bound form');
         }
 
@@ -346,6 +367,12 @@ class Form implements \IteratorAggregate, FormInterface
             $modelData = clone $modelData;
         }
 
+        if ($this->lockSetData) {
+            throw new FormException('A cycle was detected. Listeners to the PRE_SET_DATA event must not call setData(). You should call setData() on the FormEvent object instead.');
+        }
+
+        $this->lockSetData = true;
+
         // Hook to change content of the data
         $event = new FormEvent($this, $modelData);
         $this->config->getEventDispatcher()->dispatch(FormEvents::PRE_SET_DATA, $event);
@@ -395,8 +422,12 @@ class Form implements \IteratorAggregate, FormInterface
         $this->normData = $normData;
         $this->viewData = $viewData;
         $this->synchronized = true;
+        $this->initialized = true;
+        $this->lockSetData = false;
 
-        if ($this->config->getCompound()) {
+        // It is not necessary to invoke this method if the form doesn't have children,
+        // even if the form is compound.
+        if (count($this->children) > 0) {
             // Update child forms from the data
             $this->config->getDataMapper()->mapDataToForms($viewData, $this->children);
         }
@@ -414,9 +445,29 @@ class Form implements \IteratorAggregate, FormInterface
      */
     public function getData()
     {
+        if (!$this->initialized) {
+            $this->setData($this->config->getData());
+        }
+
         return $this->modelData;
     }
 
+    /**
+     * Returns the normalized data of the form.
+     *
+     * @return mixed When the form is not bound, the default data is returned.
+     *                When the form is bound, the normalized bound data is
+     *                returned if the form is valid, null otherwise.
+     */
+    public function getNormData()
+    {
+        if (!$this->initialized) {
+            $this->setData($this->config->getData());
+        }
+
+        return $this->normData;
+    }
+
     /**
      * Returns the data transformed by the value transformer.
      *
@@ -424,6 +475,10 @@ class Form implements \IteratorAggregate, FormInterface
      */
     public function getViewData()
     {
+        if (!$this->initialized) {
+            $this->setData($this->config->getData());
+        }
+
         return $this->viewData;
     }
 
@@ -543,7 +598,9 @@ class Form implements \IteratorAggregate, FormInterface
         }
 
         // Merge form data from children into existing view data
-        if ($this->config->getCompound()) {
+        // It is not necessary to invoke this method if the form has no children,
+        // even if it is compound.
+        if (count($this->children) > 0) {
             $this->config->getDataMapper()->mapFormsToData($this->children, $viewData);
         }
 
@@ -562,7 +619,7 @@ class Form implements \IteratorAggregate, FormInterface
             // Synchronize representations - must not change the content!
             $modelData = $this->normToModel($normData);
             $viewData = $this->normToView($normData);
-            
+
             $synchronized = true;
         } catch (TransformationFailedException $e) {
         }
@@ -573,6 +630,7 @@ class Form implements \IteratorAggregate, FormInterface
         $this->viewData = $viewData;
         $this->extraData = $extraData;
         $this->synchronized = $synchronized;
+        $this->initialized = true;
 
         $event = new FormEvent($this, $viewData);
         $this->config->getEventDispatcher()->dispatch(FormEvents::POST_BIND, $event);
@@ -604,18 +662,6 @@ class Form implements \IteratorAggregate, FormInterface
         return $this->bind($request);
     }
 
-    /**
-     * Returns the normalized data of the form.
-     *
-     * @return mixed When the form is not bound, the default data is returned.
-     *                When the form is bound, the normalized bound data is
-     *                returned if the form is valid, null otherwise.
-     */
-    public function getNormData()
-    {
-        return $this->normData;
-    }
-
     /**
      * Adds an error to this form.
      *
@@ -833,11 +879,32 @@ class Form implements \IteratorAggregate, FormInterface
             throw new FormException('You cannot add children to a simple form. Maybe you should set the option "compound" to true?');
         }
 
+        // Obtain the view data
+        $viewData = null;
+
+        // If setData() is currently being called, there is no need to call
+        // mapDataToForms() here, as mapDataToForms() is called at the end
+        // of setData() anyway. Not doing this check leads to an endless
+        // recursion when initializing the form lazily and an event listener
+        // (such as ResizeFormListener) adds fields depending on the data:
+        //
+        //  * setData() is called, the form is not initialized yet
+        //  * add() is called by the listener (setData() is not complete, so
+        //    the form is still not initialized)
+        //  * getViewData() is called
+        //  * setData() is called since the form is not initialized yet
+        //  * ... endless recursion ...
+        if (!$this->lockSetData) {
+            $viewData = $this->getViewData();
+        }
+
         $this->children[$child->getName()] = $child;
 
         $child->setParent($this);
 
-        $this->config->getDataMapper()->mapDataToForms($this->getViewData(), array($child));
+        if (!$this->lockSetData) {
+            $this->config->getDataMapper()->mapDataToForms($viewData, array($child));
+        }
 
         return $this;
     }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/FormRenderer.php b/vendor/symfony/symfony/src/Symfony/Component/Form/FormRenderer.php
new file mode 100644
index 0000000..738c01f
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/FormRenderer.php
@@ -0,0 +1,350 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form;
+
+use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+use Symfony\Component\Form\Exception\FormException;
+use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
+
+/**
+ * Renders a form into HTML using a rendering engine.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class FormRenderer implements FormRendererInterface
+{
+    /**
+     * @var FormRendererEngineInterface
+     */
+    private $engine;
+
+    /**
+     * @var CsrfProviderInterface
+     */
+    private $csrfProvider;
+
+    /**
+     * @var array
+     */
+    private $blockHierarchyMap = array();
+
+    /**
+     * @var array
+     */
+    private $hierarchyLevelMap = array();
+
+    /**
+     * @var array
+     */
+    private $variableMap = array();
+
+    /**
+     * @var array
+     */
+    private $stack = array();
+
+    public function __construct(FormRendererEngineInterface $engine, CsrfProviderInterface $csrfProvider = null)
+    {
+        $this->engine = $engine;
+        $this->csrfProvider = $csrfProvider;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getEngine()
+    {
+        return $this->engine;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setTheme(FormViewInterface $view, $themes)
+    {
+        $this->engine->setTheme($view, $themes);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderEnctype(FormViewInterface $view)
+    {
+        return $this->renderSection($view, 'enctype');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderRow(FormViewInterface $view, array $variables = array())
+    {
+        return $this->renderSection($view, 'row', $variables);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderRest(FormViewInterface $view, array $variables = array())
+    {
+        return $this->renderSection($view, 'rest', $variables);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderWidget(FormViewInterface $view, array $variables = array())
+    {
+        return $this->renderSection($view, 'widget', $variables);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderErrors(FormViewInterface $view)
+    {
+        return $this->renderSection($view, 'errors');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderLabel(FormViewInterface $view, $label = null, array $variables = array())
+    {
+        if ($label !== null) {
+            $variables += array('label' => $label);
+        }
+
+        return $this->renderSection($view, 'label', $variables);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderCsrfToken($intention)
+    {
+        if (null === $this->csrfProvider) {
+            throw new \BadMethodCallException('CSRF token can only be generated if a CsrfProviderInterface is injected in the constructor.');
+        }
+
+        return $this->csrfProvider->generateCsrfToken($intention);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderBlock($block, array $variables = array())
+    {
+        if (0 == count($this->stack)) {
+            throw new FormException('This method should only be called while rendering a form element.');
+        }
+
+        list($view, $scopeVariables) = end($this->stack);
+
+        $resource = $this->engine->getResourceForBlock($view, $block);
+
+        if (!$resource) {
+            throw new FormException(sprintf('No block "%s" found while rendering the form.', $block));
+        }
+
+        // Merge the passed with the existing attributes
+        if (isset($variables['attr']) && isset($scopeVariables['attr'])) {
+            $variables['attr'] = array_replace($scopeVariables['attr'], $variables['attr']);
+        }
+
+        // Merge the passed with the exist *label* attributes
+        if (isset($variables['label_attr']) && isset($scopeVariables['label_attr'])) {
+            $variables['label_attr'] = array_replace($scopeVariables['label_attr'], $variables['label_attr']);
+        }
+
+        // Do not use array_replace_recursive(), otherwise array variables
+        // cannot be overwritten
+        $variables = array_replace($scopeVariables, $variables);
+
+        return $this->engine->renderBlock($view, $resource, $block, $variables);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isChoiceGroup($choice)
+    {
+        return is_array($choice) || $choice instanceof \Traversable;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isChoiceSelected(FormViewInterface $view, ChoiceView $choice)
+    {
+        $value = $view->getVar('value');
+        $choiceValue = $choice->getValue();
+
+        if (is_array($value)) {
+            return false !== array_search($choiceValue, $value, true);
+        }
+
+        return $choiceValue === $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function humanize($text)
+    {
+        return ucfirst(trim(strtolower(preg_replace('/[_\s]+/', ' ', $text))));
+    }
+
+    /**
+     * Renders the given section of a form view.
+     *
+     * @param FormViewInterface $view      The form view.
+     * @param string            $section   The name of the section to render.
+     * @param array             $variables The variables to pass to the template.
+     *
+     * @return string The HTML markup.
+     *
+     * @throws Exception\FormException If no fitting template was found.
+     */
+    protected function renderSection(FormViewInterface $view, $section, array $variables = array())
+    {
+        $renderOnlyOnce = in_array($section, array('row', 'widget'));
+
+        if ($renderOnlyOnce && $view->isRendered()) {
+            return '';
+        }
+
+        // The cache key for storing the variables and types
+        $mapKey = $uniqueBlockName = $view->getVar('full_block_name') . '_' . $section;
+
+        // In templates, we have to deal with two kinds of block hierarchies:
+        //
+        //   +---------+          +---------+
+        //   | Theme B | -------> | Theme A |
+        //   +---------+          +---------+
+        //
+        //   form_widget -------> form_widget
+        //       ^
+        //       |
+        //  choice_widget -----> choice_widget
+        //
+        // The first kind of hierarchy is the theme hierarchy. This allows to
+        // override the block "choice_widget" from Theme A in the extending
+        // Theme B. This kind of inheritance needs to be supported by the
+        // template engine and, for example, offers "parent()" or similar
+        // functions to fall back from the custom to the parent implementation.
+        //
+        // The second kind of hierarchy is the form type hierarchy. This allows
+        // to implement a custom "choice_widget" block (no matter in which theme),
+        // or to fallback to the block of the parent type, which would be
+        // "form_widget" in this example (again, no matter in which theme).
+        // If the designer wants to explicitly fallback to "form_widget" in his
+        // custom "choice_widget", for example because he only wants to wrap
+        // a <div> around the original implementation, he can simply call the
+        // widget() function again to render the block for the parent type.
+        //
+        // The second kind is implemented in the following blocks.
+        if (!isset($this->blockHierarchyMap[$mapKey])) {
+            // INITIAL CALL
+            // Calculate the hierarchy of template blocks and start on
+            // the bottom level of the hierarchy (= "_<id>_<section>" block)
+            $blockHierarchy = array();
+            foreach ($view->getVar('types') as $type) {
+                $blockHierarchy[] = $type . '_' . $section;
+            }
+            $blockHierarchy[] = $uniqueBlockName;
+            $hierarchyLevel = count($blockHierarchy) - 1;
+
+            // The default variable scope contains all view variables, merged with
+            // the variables passed explicitly to the helper
+            $scopeVariables = $view->getVars();
+        } else {
+            // RECURSIVE CALL
+            // If a block recursively calls renderSection() again, resume rendering
+            // using the parent type in the hierarchy.
+            $blockHierarchy = $this->blockHierarchyMap[$mapKey];
+            $hierarchyLevel = $this->hierarchyLevelMap[$mapKey] - 1;
+
+            // Reuse the current scope and merge it with the explicitly passed variables
+            $scopeVariables = $this->variableMap[$mapKey];
+        }
+
+        // Load the resource where this block can be found
+        $resource = $this->engine->getResourceForBlockHierarchy($view, $blockHierarchy, $hierarchyLevel);
+
+        // Update the current hierarchy level to the one at which the resource was
+        // found. For example, if looking for "choice_widget", but only a resource
+        // is found for its parent "form_widget", then the level is updated here
+        // to the parent level.
+        $hierarchyLevel = $this->engine->getResourceHierarchyLevel($view, $blockHierarchy, $hierarchyLevel);
+
+        // The actually existing block name in $resource
+        $block = $blockHierarchy[$hierarchyLevel];
+
+        // Escape if no resource exists for this block
+        if (!$resource) {
+            throw new FormException(sprintf(
+                'Unable to render the form as none of the following blocks exist: "%s".',
+                implode('", "', array_reverse($blockHierarchy))
+            ));
+        }
+
+        // Merge the passed with the existing attributes
+        if (isset($variables['attr']) && isset($scopeVariables['attr'])) {
+            $variables['attr'] = array_replace($scopeVariables['attr'], $variables['attr']);
+        }
+
+        // Merge the passed with the exist *label* attributes
+        if (isset($variables['label_attr']) && isset($scopeVariables['label_attr'])) {
+            $variables['label_attr'] = array_replace($scopeVariables['label_attr'], $variables['label_attr']);
+        }
+
+        // Do not use array_replace_recursive(), otherwise array variables
+        // cannot be overwritten
+        $variables = array_replace($scopeVariables, $variables);
+
+        // In order to make recursive calls possible, we need to store the block hierarchy,
+        // the current level of the hierarchy and the variables so that this method can
+        // resume rendering one level higher of the hierarchy when it is called recursively.
+        //
+        // We need to store these values in maps (associative arrays) because within a
+        // call to widget() another call to widget() can be made, but for a different view
+        // object. These nested calls should not override each other.
+        $this->blockHierarchyMap[$mapKey] = $blockHierarchy;
+        $this->hierarchyLevelMap[$mapKey] = $hierarchyLevel;
+        $this->variableMap[$mapKey] = $variables;
+
+        // We also need to store the view and the variables so that we can render custom
+        // blocks with renderBlock() using the same themes and variables as in the outer
+        // block.
+        //
+        // A stack is sufficient for this purpose, because renderBlock() always accesses
+        // the immediate next outer scope, which is always stored at the end of the stack.
+        $this->stack[] = array($view, $variables);
+
+        // Do the rendering
+        $html = $this->engine->renderBlock($view, $resource, $block, $variables);
+
+        // Clear the stack
+        array_pop($this->stack);
+
+        // Clear the maps
+        unset($this->blockHierarchyMap[$mapKey]);
+        unset($this->hierarchyLevelMap[$mapKey]);
+        unset($this->variableMap[$mapKey]);
+
+        if ($renderOnlyOnce) {
+            $view->setRendered();
+        }
+
+        return $html;
+    }
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/FormRendererEngineInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Form/FormRendererEngineInterface.php
new file mode 100644
index 0000000..aca8f75
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/FormRendererEngineInterface.php
@@ -0,0 +1,146 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form;
+
+/**
+ * Adapter for rendering form templates with a specific templating engine.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+interface FormRendererEngineInterface
+{
+    /**
+     * Sets the theme(s) to be used for rendering a view and its children.
+     *
+     * @param FormViewInterface $view   The view to assign the theme(s) to.
+     * @param mixed             $themes The theme(s). The type of these themes
+     *                                  is open to the implementation.
+     */
+    public function setTheme(FormViewInterface $view, $themes);
+
+    /**
+     * Returns the resource for a block name.
+     *
+     * The resource is first searched in the themes attached to $view, then
+     * in the themes of its parent view and so on, until a resource was found.
+     *
+     * The type of the resource is decided by the implementation. The resource
+     * is later passed to {@link renderBlock()} by the rendering algorithm.
+     *
+     * @param FormViewInterface $view  The view for determining the used themes.
+     *                                 First the themes attached directly to the
+     *                                 view with {@link setTheme()} are considered,
+     *                                 then the ones of its parent etc.
+     * @param string            $block The name of the block to render.
+     *
+     * @return mixed The renderer resource or false, if none was found.
+     */
+    public function getResourceForBlock(FormViewInterface $view, $block);
+
+    /**
+     * Returns the resource for a block hierarchy.
+     *
+     * A block hierarchy is an array which starts with the root of the hierarchy
+     * and continues with the child of that root, the child of that child etc.
+     * The following is an example for a block hierarchy:
+     *
+     * <code>
+     * form_widget
+     * text_widget
+     * url_widget
+     * </code>
+     *
+     * In this example, "url_widget" is the most specific block, while the other
+     * blocks are its ancestors in the hierarchy.
+     *
+     * The second parameter $hierarchyLevel determines the level of the hierarchy
+     * that should be rendered. For example, if $hierarchyLevel is 2 for the
+     * above hierarchy, the engine will first look for the block "url_widget",
+     * then, if that does not exist, for the block "text_widget" etc.
+     *
+     * The type of the resource is decided by the implementation. The resource
+     * is later passed to {@link renderBlock()} by the rendering algorithm.
+     *
+     * @param FormViewInterface $view           The view for determining the used
+     *                                          themes. First the themes attached
+     *                                          directly to the view with
+     *                                          {@link setTheme()} are considered,
+     *                                          then the ones of its parent etc.
+     * @param array             $blockHierarchy The block name hierarchy, with
+     *                                          the root block at the beginning.
+     * @param integer           $hierarchyLevel The level in the hierarchy at
+     *                                          which to start looking. Level 0
+     *                                          indicates the root block, i.e.
+     *                                          the first element of $blockHierarchy.
+     *
+     * @return mixed The renderer resource or false, if none was found.
+     */
+    public function getResourceForBlockHierarchy(FormViewInterface $view, array $blockHierarchy, $hierarchyLevel);
+
+    /**
+     * Returns the hierarchy level at which a resource can be found.
+     *
+     * A block hierarchy is an array which starts with the root of the hierarchy
+     * and continues with the child of that root, the child of that child etc.
+     * The following is an example for a block hierarchy:
+     *
+     * <code>
+     * form_widget
+     * text_widget
+     * url_widget
+     * </code>
+     *
+     * The second parameter $hierarchyLevel determines the level of the hierarchy
+     * that should be rendered.
+     *
+     * If we call this method with the hierarchy level 2, the engine will first
+     * look for a resource for block "url_widget". If such a resource exists,
+     * the method returns 2. Otherwise it tries to find a resource for block
+     * "text_widget" (at level 1) and, again, returns 1 if a resource was found.
+     * The method continues to look for resources until the root level was
+     * reached and nothing was found. In this case false is returned.
+     *
+     * The type of the resource is decided by the implementation. The resource
+     * is later passed to {@link renderBlock()} by the rendering algorithm.
+     *
+     * @param FormViewInterface $view           The view for determining the used
+     *                                          themes. First the themes attached
+     *                                          directly to the view with
+     *                                          {@link setTheme()} are considered,
+     *                                          then the ones of its parent etc.
+     * @param array             $blockHierarchy The block name hierarchy, with
+     *                                          the root block at the beginning.
+     * @param integer           $hierarchyLevel The level in the hierarchy at
+     *                                          which to start looking. Level 0
+     *                                          indicates the root block, i.e.
+     *                                          the first element of $blockHierarchy.
+     *
+     * @return integer|Boolean The hierarchy level or false, if no resource was found.
+     */
+    public function getResourceHierarchyLevel(FormViewInterface $view, array $blockHierarchy, $hierarchyLevel);
+
+    /**
+     * Renders a block in the given renderer resource.
+     *
+     * The resource can be obtained by calling {@link getResourceForBlock()}
+     * or {@link getResourceForBlockHierarchy()}. The type of the resource is
+     * decided by the implementation.
+     *
+     * @param FormViewInterface $view      The view to render.
+     * @param mixed             $resource  The renderer resource.
+     * @param string            $block     The name of the block to render.
+     * @param array             $variables The variables to pass to the template.
+     *
+     * @return string The HTML markup.
+     */
+    public function renderBlock(FormViewInterface $view, $resource, $block, array $variables = array());
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/FormRendererInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Form/FormRendererInterface.php
new file mode 100644
index 0000000..1da338a
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/FormRendererInterface.php
@@ -0,0 +1,180 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form;
+
+use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+
+/**
+ * Renders a form into HTML.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+interface FormRendererInterface
+{
+    /**
+     * Returns the engine used by this renderer.
+     *
+     * @return FormRendererEngineInterface The renderer engine.
+     */
+    public function getEngine();
+
+    /**
+     * Sets the theme(s) to be used for rendering a view and its children.
+     *
+     * @param FormViewInterface $view   The view to assign the theme(s) to.
+     * @param mixed             $themes The theme(s). The type of these themes
+     *                                  is open to the implementation.
+     */
+    public function setTheme(FormViewInterface $view, $themes);
+
+    /**
+     * Renders the HTML enctype in the form tag, if necessary.
+     *
+     * Example usage templates:
+     *
+     *     <form action="..." method="post" <?php echo $renderer->renderEnctype($form) ?>>
+     *
+     * @param FormViewInterface $view The view for which to render the encoding type
+     *
+     * @return string The HTML markup
+     */
+    public function renderEnctype(FormViewInterface $view);
+
+    /**
+     * Renders the entire row for a form field.
+     *
+     * A row typically contains the label, errors and widget of a field.
+     *
+     * @param FormViewInterface $view      The view for which to render the row
+     * @param array             $variables Additional variables passed to the template
+     *
+     * @return string The HTML markup
+     */
+    public function renderRow(FormViewInterface $view, array $variables = array());
+
+    /**
+     * Renders views which have not already been rendered.
+     *
+     * @param FormViewInterface $view      The parent view
+     * @param array             $variables An array of variables
+     *
+     * @return string The HTML markup
+     */
+    public function renderRest(FormViewInterface $view, array $variables = array());
+
+    /**
+     * Renders the HTML for a given view.
+     *
+     * Example usage:
+     *
+     *     <?php echo $renderer->renderWidget($form) ?>
+     *
+     * You can pass options during the call:
+     *
+     *     <?php echo $renderer->renderWidget($form, array('attr' => array('class' => 'foo'))) ?>
+     *
+     *     <?php echo $renderer->renderWidget($form, array('separator' => '+++++)) ?>
+     *
+     * @param FormViewInterface $view      The view for which to render the widget
+     * @param array             $variables Additional variables passed to the template
+     *
+     * @return string The HTML markup
+     */
+    public function renderWidget(FormViewInterface $view, array $variables = array());
+
+    /**
+     * Renders the errors of the given view.
+     *
+     * @param FormViewInterface $view The view to render the errors for
+     *
+     * @return string The HTML markup
+     */
+    public function renderErrors(FormViewInterface $view);
+
+    /**
+     * Renders the label of the given view.
+     *
+     * @param FormViewInterface $view      The view for which to render the label
+     * @param string            $label     The label
+     * @param array             $variables Additional variables passed to the template
+     *
+     * @return string The HTML markup
+     */
+    public function renderLabel(FormViewInterface $view, $label = null, array $variables = array());
+
+    /**
+     * Renders a named block of the form theme.
+     *
+     * @param string $block     The name of the block.
+     * @param array  $variables The variables to pass to the template.
+     *
+     * @return string The HTML markup
+     */
+    public function renderBlock($block, array $variables = array());
+
+    /**
+     * Renders a CSRF token.
+     *
+     * Use this helper for CSRF protection without the overhead of creating a
+     * form.
+     *
+     * <code>
+     * <input type="hidden" name="token" value="<?php $renderer->renderCsrfToken('rm_user_'.$user->getId()) ?>">
+     * </code>
+     *
+     * Check the token in your action using the same intention.
+     *
+     * <code>
+     * $csrfProvider = $this->get('form.csrf_provider');
+     * if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
+     *     throw new \RuntimeException('CSRF attack detected.');
+     * }
+     * </code>
+     *
+     * @param string $intention The intention of the protected action
+     *
+     * @return string A CSRF token
+     */
+    public function renderCsrfToken($intention);
+
+    /**
+     * Returns whether the given choice is a group.
+     *
+     * @param mixed $choice A choice
+     *
+     * @return Boolean Whether the choice is a group
+     */
+    public function isChoiceGroup($choice);
+
+    /**
+     * Returns whether the given choice is selected.
+     *
+     * @param FormViewInterface $view   The view of the choice field
+     * @param ChoiceView        $choice The choice to check
+     *
+     * @return Boolean Whether the choice is selected
+     */
+    public function isChoiceSelected(FormViewInterface $view, ChoiceView $choice);
+
+    /**
+     * Makes a technical name human readable.
+     *
+     * Sequences of underscores are replaced by single spaces. The first letter
+     * of the resulting string is capitalized, while all other letters are
+     * turned to lowercase.
+     *
+     * @param string $text The text to humanize.
+     *
+     * @return string The humanized text.
+     */
+    public function humanize($text);
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/UnmodifiableFormConfig.php b/vendor/symfony/symfony/src/Symfony/Component/Form/ImmutableFormConfig.php
similarity index 96%
rename from vendor/symfony/symfony/src/Symfony/Component/Form/UnmodifiableFormConfig.php
rename to vendor/symfony/symfony/src/Symfony/Component/Form/ImmutableFormConfig.php
index cb586a8..36bd867 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/UnmodifiableFormConfig.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/ImmutableFormConfig.php
@@ -12,14 +12,14 @@
 namespace Symfony\Component\Form;
 
 use Symfony\Component\Form\Util\PropertyPath;
-use Symfony\Component\EventDispatcher\UnmodifiableEventDispatcher;
+use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
 
 /**
  * A read-only form configuration.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class UnmodifiableFormConfig implements FormConfigInterface
+class ImmutableFormConfig implements FormConfigInterface
 {
     /**
      * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
@@ -134,8 +134,8 @@ class UnmodifiableFormConfig implements FormConfigInterface
     public function __construct(FormConfigInterface $config)
     {
         $dispatcher = $config->getEventDispatcher();
-        if (!$dispatcher instanceof UnmodifiableEventDispatcher) {
-            $dispatcher = new UnmodifiableEventDispatcher($dispatcher);
+        if (!$dispatcher instanceof ImmutableEventDispatcher) {
+            $dispatcher = new ImmutableEventDispatcher($dispatcher);
         }
 
         $this->dispatcher = $dispatcher;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
index 01c8d96..bb97cd6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
@@ -545,7 +545,7 @@ abstract class AbstractDivLayoutTest extends AbstractLayoutTest
             ]
         /following-sibling::div
             [
-                ./label
+                ./label[.="child"]
                 /following-sibling::div
                     [
                         ./div
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php
index 1fecee9..4e59185 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php
@@ -20,7 +20,7 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Form\Tests\Fixtures\FixedDataTransformer;
 
-class FormTest extends AbstractFormTest
+class CompoundFormTest extends AbstractFormTest
 {
     public function testValidIfAllChildrenAreValid()
     {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
index 3ed8b5b..a7d5f8b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -226,7 +226,7 @@ class DateTimeTypeTest extends LocalizedTestCase
     // Bug fix
     public function testInitializeWithDateTime()
     {
-        // Throws an exception if "data_class" option is not explicitely set
+        // Throws an exception if "data_class" option is not explicitly set
         // to null in the type
         $this->factory->create('datetime', new \DateTime());
     }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
index cd99217..b618902 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -558,7 +558,7 @@ class DateTypeTest extends LocalizedTestCase
     // Bug fix
     public function testInitializeWithDateTime()
     {
-        // Throws an exception if "data_class" option is not explicitely set
+        // Throws an exception if "data_class" option is not explicitly set
         // to null in the type
         $this->factory->create('date', new \DateTime());
     }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
index 8e61181..4aed58d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -403,7 +403,7 @@ class TimeTypeTest extends LocalizedTestCase
     // Bug fix
     public function testInitializeWithDateTime()
     {
-        // Throws an exception if "data_class" option is not explicitely set
+        // Throws an exception if "data_class" option is not explicitly set
         // to null in the type
         $this->factory->create('time', new \DateTime());
     }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormRendererTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormRendererTest.php
new file mode 100644
index 0000000..bf212c9
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormRendererTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+
+class FormRendererTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $engine;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $csrfProvider;
+
+    /**
+     * @var FormRenderer
+     */
+    private $renderer;
+
+    protected function setUp()
+    {
+        $this->engine = $this->getMock('Symfony\Component\Form\FormRendererEngineInterface');
+        $this->csrfProvider = $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface');
+        $this->renderer = new FormRenderer($this->engine, $this->csrfProvider);
+    }
+
+    public function isChoiceGroupProvider()
+    {
+        return array(
+            array(false, 0),
+            array(false, '0'),
+            array(false, '1'),
+            array(false, 1),
+            array(false, ''),
+            array(false, null),
+            array(false, true),
+
+            array(true, array()),
+        );
+    }
+
+    /**
+     * @dataProvider isChoiceGroupProvider
+     */
+    public function testIsChoiceGroup($expected, $value)
+    {
+        $this->assertSame($expected, $this->renderer->isChoiceGroup($value));
+    }
+
+    public function testIsChoiceGroupPart2()
+    {
+        $this->assertTrue($this->renderer->isChoiceGroup(new \SplFixedArray(1)));
+    }
+
+    public function isChoiceSelectedProvider()
+    {
+        // The commented cases should not be necessary anymore, because the
+        // choice lists should assure that both values passed here are always
+        // strings
+        return array(
+//             array(true, 0, 0),
+            array(true, '0', '0'),
+            array(true, '1', '1'),
+//             array(true, false, 0),
+//             array(true, true, 1),
+            array(true, '', ''),
+//             array(true, null, ''),
+            array(true, '1.23', '1.23'),
+            array(true, 'foo', 'foo'),
+            array(true, 'foo10', 'foo10'),
+            array(true, 'foo', array(1, 'foo', 'foo10')),
+
+            array(false, 10, array(1, 'foo', 'foo10')),
+            array(false, 0, array(1, 'foo', 'foo10')),
+        );
+    }
+
+    /**
+     * @dataProvider isChoiceSelectedProvider
+     */
+    public function testIsChoiceSelected($expected, $choice, $value)
+    {
+        $view = new FormView('name');
+        $view->setVar('value', $value);
+        $choice = new ChoiceView($choice, $choice . ' label');
+
+        $this->assertSame($expected, $this->renderer->isChoiceSelected($view, $choice));
+    }
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/SimpleFormTest.php
index cf6e478..2d24010 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/SimpleFormTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/SimpleFormTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Form\Tests;
 
 use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\Util\PropertyPath;
 use Symfony\Component\Form\FormConfig;
 use Symfony\Component\Form\FormView;
@@ -364,7 +366,7 @@ class SimpleFormTest extends AbstractFormTest
 
     /*
      * NULL remains NULL in app and norm format to remove the need to treat
-     * empty values and NULL explicitely in the application
+     * empty values and NULL explicitly in the application
      */
     public function testSetDataConvertsNullToStringIfNoTransformer()
     {
@@ -732,6 +734,21 @@ class SimpleFormTest extends AbstractFormTest
         $form->setData('foo');
     }
 
+    /**
+     * @expectedException Symfony\Component\Form\Exception\FormException
+     */
+    public function testSetDataCannotInvokeItself()
+    {
+        // Cycle detection to prevent endless loops
+        $config = new FormConfig('name', 'stdClass', $this->dispatcher);
+        $config->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+            $event->getForm()->setData('bar');
+        });
+        $form = new Form($config);
+
+        $form->setData('foo');
+    }
+
     protected function createForm()
     {
         return $this->getBuilder()->getForm();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Util/FormUtilTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Util/FormUtilTest.php
index f5d24cf..3943e7a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Util/FormUtilTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Util/FormUtilTest.php
@@ -15,65 +15,6 @@ use Symfony\Component\Form\Util\FormUtil;
 
 class FormUtilTest extends \PHPUnit_Framework_TestCase
 {
-    public function isChoiceGroupProvider()
-    {
-        return array(
-            array(false, 0),
-            array(false, '0'),
-            array(false, '1'),
-            array(false, 1),
-            array(false, ''),
-            array(false, null),
-            array(false, true),
-
-            array(true, array()),
-        );
-    }
-
-    /**
-     * @dataProvider isChoiceGroupProvider
-     */
-    public function testIsChoiceGroup($expected, $value)
-    {
-        $this->assertSame($expected, FormUtil::isChoiceGroup($value));
-    }
-
-    public function testIsChoiceGroupPart2()
-    {
-        $this->assertTrue(FormUtil::isChoiceGroup(new \SplFixedArray(1)));
-    }
-
-    public function isChoiceSelectedProvider()
-    {
-        // The commented cases should not be necessary anymore, because the
-        // choice lists should assure that both values passed here are always
-        // strings
-        return array(
-//             array(true, 0, 0),
-            array(true, '0', '0'),
-            array(true, '1', '1'),
-//             array(true, false, 0),
-//             array(true, true, 1),
-            array(true, '', ''),
-//             array(true, null, ''),
-            array(true, '1.23', '1.23'),
-            array(true, 'foo', 'foo'),
-            array(true, 'foo10', 'foo10'),
-            array(true, 'foo', array(1, 'foo', 'foo10')),
-
-            array(false, 10, array(1, 'foo', 'foo10')),
-            array(false, 0, array(1, 'foo', 'foo10')),
-        );
-    }
-
-    /**
-     * @dataProvider isChoiceSelectedProvider
-     */
-    public function testIsChoiceSelected($expected, $choice, $value)
-    {
-        $this->assertSame($expected, FormUtil::isChoiceSelected($choice, $value));
-    }
-
     public function singularifyProvider()
     {
         // see http://english-zone.com/spelling/plurals.html
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Util/FormUtil.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Util/FormUtil.php
index cf7d4d7..614361c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Util/FormUtil.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Util/FormUtil.php
@@ -191,35 +191,6 @@ abstract class FormUtil
         return $plural;
     }
 
-    /**
-     * Returns whether the given choice is a group.
-     *
-     * @param mixed $choice A choice
-     *
-     * @return Boolean Whether the choice is a group
-     */
-    public static function isChoiceGroup($choice)
-    {
-        return is_array($choice) || $choice instanceof \Traversable;
-    }
-
-    /**
-     * Returns whether the given choice is selected.
-     *
-     * @param mixed $choice The choice
-     * @param mixed $value  the value
-     *
-     * @return Boolean Whether the choice is selected
-     */
-    public static function isChoiceSelected($choice, $value)
-    {
-        if (is_array($value)) {
-            return false !== array_search($choice, $value, true);
-        }
-
-        return $choice === $value;
-    }
-
     /**
      * Returns whether the given data is empty.
      *
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php
index ae6a389..6950793 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php
@@ -379,7 +379,10 @@ class Response
      * Sets the response status code.
      *
      * @param integer $code HTTP status code
-     * @param string  $text HTTP status text
+     * @param mixed   $text HTTP status text
+     *
+     * If the status text is null it will be automatically populated for the known
+     * status codes and left empty otherwise.
      *
      * @return Response
      *
@@ -389,12 +392,24 @@ class Response
      */
     public function setStatusCode($code, $text = null)
     {
-        $this->statusCode = (int) $code;
+        $this->statusCode = $code = (int) $code;
         if ($this->isInvalid()) {
             throw new \InvalidArgumentException(sprintf('The HTTP status code "%s" is not valid.', $code));
         }
 
-        $this->statusText = false === $text ? '' : (null === $text ? self::$statusTexts[$this->statusCode] : $text);
+        if (null === $text) {
+            $this->statusText = isset(self::$statusTexts[$code]) ? self::$statusTexts[$code] : '';
+
+            return $this;
+        }
+
+        if (false === $text) {
+            $this->statusText = '';
+
+            return $this;
+        }
+
+        $this->statusText = $text;
 
         return $this;
     }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
index 11615b9..c27d811 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
@@ -231,7 +231,7 @@ class ResponseHeaderBag extends HeaderBag
             throw new \InvalidArgumentException(sprintf('The disposition must be either "%s" or "%s".', self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE));
         }
 
-        if (!$filenameFallback) {
+        if ('' == $filenameFallback) {
             $filenameFallback = $filename;
         }
 
@@ -246,14 +246,14 @@ class ResponseHeaderBag extends HeaderBag
         }
 
         // path separators aren't allowed in either.
-        if (preg_match('#[/\\\\]#', $filename) || preg_match('#[/\\\\]#', $filenameFallback)) {
+        if (false !== strpos($filename, '/') || false !== strpos($filename, '\\') || false !== strpos($filenameFallback, '/') || false !== strpos($filenameFallback, '\\')) {
             throw new \InvalidArgumentException('The filename and the fallback cannot contain the "/" and "\\" characters.');
         }
 
-        $output = sprintf('%s; filename="%s"', $disposition, str_replace(array('\\', '"'), array('\\\\', '\\"'), $filenameFallback));
+        $output = sprintf('%s; filename="%s"', $disposition, str_replace('"', '\\"', $filenameFallback));
 
-        if ($filename != $filenameFallback) {
-            $output .= sprintf("; filename*=utf-8''%s", str_replace(array("'", '(', ')', '*'), array('%27', '%28', '%29', '%2A'), urlencode($filename)));
+        if ($filename !== $filenameFallback) {
+            $output .= sprintf("; filename*=utf-8''%s", rawurlencode($filename));
         }
 
         return $output;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
index 4edcd6d..cbbdd29 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -367,6 +367,33 @@ class ResponseTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($response->isInvalid());
     }
 
+    /**
+     * @dataProvider getStatusCodeFixtures
+     */
+    public function testSetStatusCode($code, $text, $expectedText)
+    {
+        $response = new Response();
+
+        $response->setStatusCode($code, $text);
+
+        $statusText = new \ReflectionProperty($response, 'statusText');
+        $statusText->setAccessible(true);
+
+        $this->assertEquals($expectedText, $statusText->getValue($response));
+    }
+
+    public function getStatusCodeFixtures()
+    {
+        return array(
+            array('200', null, 'OK'),
+            array('200', false, ''),
+            array('200', 'foo', 'foo'),
+            array('199', null, ''),
+            array('199', false, ''),
+            array('199', 'foo', 'foo')
+        );
+    }
+
     public function testIsInformational()
     {
         $response = new Response('', 100);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index 7ca2327..b410c23 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -17,14 +17,24 @@ use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * RequestDataCollector.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class RequestDataCollector extends DataCollector
+class RequestDataCollector extends DataCollector implements EventSubscriberInterface
 {
+    protected $controllers;
+
+    public function __construct()
+    {
+        $this->controllers = new \SplObjectStorage();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -89,7 +99,26 @@ class RequestDataCollector extends DataCollector
             'session_attributes' => $sessionAttributes,
             'flashes'            => $flashes,
             'path_info'          => $request->getPathInfo(),
+            'controller'         => 'n/a',
         );
+
+        if (isset($this->controllers[$request])) {
+            $controller = $this->controllers[$request];
+            if (is_array($controller)) {
+                $r = new \ReflectionMethod($controller[0], $controller[1]);
+                $this->data['controller'] = array(
+                    'class'  => get_class($controller[0]),
+                    'method' => $controller[1],
+                    'file'   => $r->getFilename(),
+                    'line'   => $r->getStartLine(),
+                );
+            } elseif ($controller instanceof \Closure) {
+                $this->data['controller'] = 'Closure';
+            } else {
+                $this->data['controller'] = (string) $controller ?: 'n/a';
+            }
+            unset($this->controllers[$request]);
+        }
     }
 
     public function getPathInfo()
@@ -167,25 +196,28 @@ class RequestDataCollector extends DataCollector
         return $this->data['format'];
     }
 
-
     /**
-     * Gets the route.
+     * Gets the route name.
+     *
+     * The _route request attributes is automatically set by the Router Matcher.
      *
      * @return string The route
      */
     public function getRoute()
     {
-        return 'n/a';
+        return isset($this->data['request_attributes']['_route']) ? $this->data['request_attributes']['_route'] : '';
     }
 
     /**
-     * Returns the route parameters.
+     * Gets the route parameters.
+     *
+     * The _route_params request attributes is automatically set by the RouterListener.
      *
      * @return array The parameters
      */
     public function getRouteParams()
     {
-        return 'n/a';
+        return isset($this->data['request_attributes']['_route_params']) ? $this->data['request_attributes']['_route_params'] : array();
     }
 
     /**
@@ -195,7 +227,17 @@ class RequestDataCollector extends DataCollector
      */
     public function getController()
     {
-        return 'n/a';
+        return $this->data['controller'];
+    }
+
+    public function onKernelController(FilterControllerEvent $event)
+    {
+        $this->controllers[$event->getRequest()] = $event->getController();
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(KernelEvents::CONTROLLER => 'onKernelController');
     }
 
     /**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
index 0175d20..5b2228b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -117,9 +117,13 @@ class ProfilerListener implements EventSubscriberInterface
             array_pop($this->requests);
 
             $parent = end($this->requests);
-            $profiles = isset($this->children[$parent]) ? $this->children[$parent] : array();
-            $profiles[] = $profile;
-            $this->children[$parent] = $profiles;
+
+            // when simulating requests, we might not have the parent
+            if ($parent) {
+                $profiles = isset($this->children[$parent]) ? $this->children[$parent] : array();
+                $profiles[] = $profile;
+                $this->children[$parent] = $profiles;
+            }
         }
 
         if (isset($this->children[$request])) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php b/vendor/symfony/symfony/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php
index 2b3dd83..fa902a1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php
@@ -491,7 +491,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
     }
 
     /**
-     * It seems IntlDateFormatter caches the timezone id when not explicitely set via constructor or by the
+     * It seems IntlDateFormatter caches the timezone id when not explicitly set via constructor or by the
      * setTimeZoneId() method. Since testFormatWithDefaultTimezoneIntl() runs using the default environment
      * time zone, this test would use it too if not running in a separated process.
      *
diff --git a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/LazyOption.php b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/LazyOption.php
index dd52c5a..fbe700a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/LazyOption.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/LazyOption.php
@@ -33,22 +33,22 @@ class LazyOption
     /**
      * Creates a new lazy option.
      *
-     * @param Closure $closure The closure used for initializing the
-     *                               option value.
+     * @param \Closure $closure    The closure used for initializing the
+     *                             option value.
      * @param mixed $previousValue The previous value of the option. This
-     *                               value is passed to the closure when it is
-     *                               evaluated.
+     *                             value is passed to the closure when it is
+     *                             evaluated.
      *
      * @see evaluate()
      */
-    public function __construct(\Closure $closure, $previousValue)
+    public function __construct(\Closure $closure, $previousValue = null)
     {
         $this->closure = $closure;
         $this->previousValue = $previousValue;
     }
 
     /**
-     * Evaluates the underyling closure and returns its result.
+     * Evaluates the underlying closure and returns its result.
      *
      * The given Options instance is passed to the closure as first argument.
      * The previous default value set in the constructor is passed as second
@@ -60,10 +60,14 @@ class LazyOption
      */
     public function evaluate(Options $options)
     {
-        if ($this->previousValue instanceof self) {
-            $this->previousValue = $this->previousValue->evaluate($options);
+        $previousValue = $this->previousValue;
+        $closure = $this->closure;
+
+        if ($previousValue instanceof self) {
+            $previousValue = $this->previousValue->evaluate($options);
         }
 
-        return $this->closure->__invoke($options, $this->previousValue);
+        // Performs a bit better than __invoke() and call_user_func()
+        return $closure($options, $previousValue);
     }
 }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Options.php b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Options.php
index 88fa375..575faa0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Options.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Options.php
@@ -139,23 +139,32 @@ class Options implements \ArrayAccess, \Iterator, \Countable
             throw new OptionDefinitionException('Options cannot be overloaded anymore once options have been read.');
         }
 
+        // If an option is a closure that should be evaluated lazily, store it
+        // inside a LazyOption instance.
+        if ($value instanceof \Closure) {
+            $reflClosure = new \ReflectionFunction($value);
+            $params = $reflClosure->getParameters();
+
+            if (isset($params[0]) && null !== ($class = $params[0]->getClass()) && __CLASS__ === $class->name) {
+                $currentValue = isset($this->options[$option]) ? $this->options[$option] : null;
+                $value = new LazyOption($value, $currentValue);
+
+                // Store locks for lazy options to detect cyclic dependencies
+                $this->lock[$option] = false;
+
+                // Store which options are lazy for more efficient resolving
+                $this->lazy[$option] = true;
+
+                $this->options[$option] = $value;
+
+                return;
+            }
+        }
+
         // Reset lazy flag and locks by default
         unset($this->lock[$option]);
         unset($this->lazy[$option]);
 
-        // If an option is a closure that should be evaluated lazily, store it
-        // inside a LazyOption instance.
-        if (self::isEvaluatedLazily($value)) {
-            $currentValue = isset($this->options[$option]) ? $this->options[$option] : null;
-            $value = new LazyOption($value, $currentValue);
-
-            // Store locks for lazy options to detect cyclic dependencies
-            $this->lock[$option] = false;
-
-            // Store which options are lazy for more efficient resolving
-            $this->lazy[$option] = true;
-        }
-
         $this->options[$option] = $value;
     }
 
@@ -251,8 +260,14 @@ class Options implements \ArrayAccess, \Iterator, \Countable
         // Create a copy because resolve() modifies the array
         $lazy = $this->lazy;
 
+        // Performance-wise this is slightly better than
+        // while (null !== $option = key($this->lazy))
         foreach ($lazy as $option => $isLazy) {
-            $this->resolve($option);
+            // When resolve() is called, potentially multiple lazy options
+            // are evaluated, so check again if the option is still lazy.
+            if (isset($this->lazy[$option])) {
+                $this->resolve($option);
+            }
         }
 
         return $this->options;
@@ -329,7 +344,7 @@ class Options implements \ArrayAccess, \Iterator, \Countable
      */
     public function current()
     {
-        return $this->offsetGet($this->key());
+        return $this->get($this->key());
     }
 
     /**
@@ -385,52 +400,23 @@ class Options implements \ArrayAccess, \Iterator, \Countable
      */
     private function resolve($option)
     {
-        if ($this->options[$option] instanceof LazyOption) {
-            if ($this->lock[$option]) {
-                $conflicts = array_keys(array_filter($this->lock, function ($locked) {
-                    return $locked;
-                }));
+        if ($this->lock[$option]) {
+            $conflicts = array();
 
-                throw new OptionDefinitionException('The options "' . implode('", "',
-                    $conflicts) . '" have a cyclic dependency.');
+            foreach ($this->lock as $option => $locked) {
+                if ($locked) {
+                    $conflicts[] = $option;
+                }
             }
 
-            $this->lock[$option] = true;
-            $this->options[$option] = $this->options[$option]->evaluate($this);
-            $this->lock[$option] = false;
-
-            // The option now isn't lazy anymore
-            unset($this->lazy[$option]);
-        }
-    }
-
-    /**
-     * Returns whether the option is a lazy option closure.
-     *
-     * Lazy option closure expect an {@link Options} instance
-     * in their first parameter.
-     *
-     * @param mixed $value The option value to test.
-     *
-     * @return Boolean Whether it is a lazy option closure.
-     */
-    private static function isEvaluatedLazily($value)
-    {
-        if (!$value instanceof \Closure) {
-            return false;
+            throw new OptionDefinitionException('The options "' . implode('", "', $conflicts) . '" have a cyclic dependency.');
         }
 
-        $reflClosure = new \ReflectionFunction($value);
-        $params = $reflClosure->getParameters();
+        $this->lock[$option] = true;
+        $this->options[$option] = $this->options[$option]->evaluate($this);
+        $this->lock[$option] = false;
 
-        if (count($params) < 1) {
-            return false;
-        }
-
-        if (null === $params[0]->getClass()) {
-            return false;
-        }
-
-        return __CLASS__ === $params[0]->getClass()->name;
+        // The option now isn't lazy anymore
+        unset($this->lazy[$option]);
     }
 }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index 6542e9a..fdddad6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -54,10 +54,10 @@ class OptionsResolver implements OptionsResolverInterface
     private $allowedTypes = array();
 
     /**
-     * A list of filters transforming each resolved options.
+     * A list of normalizers transforming each resolved options.
      * @var array
      */
-    private $filters = array();
+    private $normalizers = array();
 
     /**
      * Creates a new instance.
@@ -190,11 +190,11 @@ class OptionsResolver implements OptionsResolverInterface
     /**
      * {@inheritdoc}
      */
-    public function setFilters(array $filters)
+    public function setNormalizers(array $normalizers)
     {
-        $this->validateOptionsExistence($filters);
+        $this->validateOptionsExistence($normalizers);
 
-        $this->filters = array_replace($this->filters, $filters);
+        $this->normalizers = array_replace($this->normalizers, $normalizers);
 
         return $this;
     }
@@ -232,7 +232,7 @@ class OptionsResolver implements OptionsResolverInterface
         }
 
         // Apply filters
-        foreach ($this->filters as $option => $filter) {
+        foreach ($this->normalizers as $option => $filter) {
             $combinedOptions->overload($option, $filter);
         }
 
diff --git a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
index 734a14d..8474c4b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
@@ -148,9 +148,9 @@ interface OptionsResolverInterface
     public function addAllowedTypes(array $allowedTypes);
 
     /**
-     * Sets filters that are applied on resolved options.
+     * Sets normalizers that are applied on resolved options.
      *
-     * The filters should be closures with the following signature:
+     * The normalizers should be closures with the following signature:
      *
      * <code>
      * function (Options $options, $value)
@@ -159,13 +159,13 @@ interface OptionsResolverInterface
      * The second parameter passed to the closure is the value of
      * the option.
      *
-     * The closure should return the filtered value.
+     * The closure should return the normalized value.
      *
-     * @param array $filters An array of filter closures.
+     * @param array $normalizers An array of closures.
      *
      * @return OptionsResolverInterface The resolver instance.
      */
-    public function setFilters(array $filters);
+    public function setNormalizers(array $normalizers);
 
     /**
      * Returns whether an option is known.
diff --git a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Tests/LazyOptionTest.php b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Tests/LazyOptionTest.php
new file mode 100644
index 0000000..48b15ce
--- /dev/null
+++ b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Tests/LazyOptionTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\OptionsResolver\Tests;
+
+use Symfony\Component\OptionsResolver\LazyOption;
+use Symfony\Component\OptionsResolver\Options;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class LazyOptionTest extends \PHPUnit_Framework_TestCase
+{
+    public function testDontCacheEvaluatedPreviousValue()
+    {
+        $previousValue = new LazyOption(function (Options $options) {
+            return $options['foo'];
+        });
+
+        $lazyOption = new LazyOption(function (Options $options, $previousValue) {
+            return $previousValue;
+        }, $previousValue);
+
+        // If provided with two different option sets, two different results
+        // should be returned
+        $options1 = new Options();
+        $options1['foo'] = 'bar';
+
+        $this->assertSame('bar', $lazyOption->evaluate($options1));
+
+        $options2 = new Options();
+        $options2['foo'] = 'boo';
+
+        $this->assertSame('boo', $lazyOption->evaluate($options2));
+    }
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
index d755b6b..d90fd72 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -538,13 +538,13 @@ class OptionsResolverTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($this->resolver->isRequired('foo'));
     }
 
-    public function testFiltersTransformFinalOptions()
+    public function testNormalizersTransformFinalOptions()
     {
         $this->resolver->setDefaults(array(
             'foo' => 'bar',
             'bam' => 'baz',
         ));
-        $this->resolver->setFilters(array(
+        $this->resolver->setNormalizers(array(
             'foo' => function (Options $options, $value) {
                 return $options['bam'] . '[' . $value . ']';
             },
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Process/Process.php b/vendor/symfony/symfony/src/Symfony/Component/Process/Process.php
index 60f2650..6df07a1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Process/Process.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Process/Process.php
@@ -290,7 +290,7 @@ class Process
             }
         }
 
-        $this->processInformation = proc_get_status($this->process);
+        $this->updateStatus();
     }
 
     /**
@@ -308,7 +308,7 @@ class Process
      */
     public function wait($callback = null)
     {
-        $this->processInformation = proc_get_status($this->process);
+        $this->updateStatus();
         $callback = $this->buildCallback($callback);
         while ($this->pipes || (defined('PHP_WINDOWS_VERSION_BUILD') && $this->fileHandles)) {
             if (defined('PHP_WINDOWS_VERSION_BUILD') && $this->fileHandles) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Route.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Route.php
index 16f34ec..318426a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Route.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Route.php
@@ -59,7 +59,7 @@ class Route implements \Serializable
     {
         return serialize(array(
             'pattern' => $this->pattern,
-            'default' => $this->default,
+            'defaults' => $this->defaults,
             'requirements' => $this->requirements,
             'options' => $this->options,
         ));
@@ -69,7 +69,7 @@ class Route implements \Serializable
     {
         $data = unserialize($data);
         $this->pattern = $data['pattern'];
-        $this->default = $data['default'];
+        $this->defaults = $data['defaults'];
         $this->requirements = $data['requirements'];
         $this->options = $data['options'];
     }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
index f752e84..1af1646 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
@@ -170,7 +170,7 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
      *
      * @param Request $request A Request instance
      *
-     * @return TokenInterface The authenticated token, or null if full authentication is not possible
+     * @return TokenInterface|Response|null The authenticated token, null if full authentication is not possible, or a Response
      *
      * @throws AuthenticationException if the authentication fails
      */
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Templating/PhpEngine.php b/vendor/symfony/symfony/src/Symfony/Component/Templating/PhpEngine.php
index 91be50d..6f1c62e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Templating/PhpEngine.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Templating/PhpEngine.php
@@ -38,6 +38,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess
     protected $charset;
     protected $cache;
     protected $escapers;
+    protected $escaperCache;
     protected $globals;
     protected $parser;
 
@@ -334,6 +335,16 @@ class PhpEngine implements EngineInterface, \ArrayAccess
      */
     public function escape($value, $context = 'html')
     {
+        // If we deal with a scalar value, we can cache the result to increase
+        // the performance when the same value is escaped multiple times (e.g. loops)
+        if (is_scalar($value)) {
+            if (!isset($this->escaperCache[$context][$value])) {
+                $this->escaperCache[$context][$value] = call_user_func($this->getEscaper($context), $value);
+            }
+
+            return $this->escaperCache[$context][$value];
+        }
+
         return call_user_func($this->getEscaper($context), $value);
     }
 
@@ -372,6 +383,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess
     public function setEscaper($context, $escaper)
     {
         $this->escapers[$context] = $escaper;
+        $this->escaperCache[$context] = array();
     }
 
     /**
@@ -489,6 +501,8 @@ class PhpEngine implements EngineInterface, \ArrayAccess
                     return $value;
                 },
         );
+
+        $this->escaperCache = array();
     }
 
     /**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/TrueValidator.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/TrueValidator.php
index 2f8c91f..2fbe047 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/TrueValidator.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/TrueValidator.php
@@ -27,15 +27,11 @@ class TrueValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (null === $value) {
-            return true;
+            return;
         }
 
-        if (true === $value || 1 === $value || '1' === $value) {
-            return true;
+        if (true !== $value && 1 !== $value && '1' !== $value) {
+            $this->context->addViolation($constraint->message);
         }
-
-        $this->context->addViolation($constraint->message);
-
-        return false;
     }
 }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Loader/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd b/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Loader/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd
index 6d5d3b5..4a9bc33 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Loader/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Loader/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd
@@ -51,12 +51,12 @@
         definitions.
       ]]></xsd:documentation>
     </xsd:annotation>
-    <xsd:sequence>
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="group-sequence-provider" type="group-sequence-provider" minOccurs="0" maxOccurs="1" />
       <xsd:element name="constraint" type="constraint" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="getter" type="getter" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
+    </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" use="required" />
   </xsd:complexType>
   
@@ -144,4 +144,4 @@
     </xsd:choice>
     <xsd:attribute name="key" type="xsd:string" use="optional" /> 
   </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/vendor/twig/twig/CHANGELOG b/vendor/twig/twig/CHANGELOG
index a58cc17..ddf2ff2 100644
--- a/vendor/twig/twig/CHANGELOG
+++ b/vendor/twig/twig/CHANGELOG
@@ -1,6 +1,7 @@
 * 1.9.1 (2012-XX-XX)
 
- * n/a
+ * fixed wrong parent class for Twig_Function_Node
+ * made Twig_Loader_Chain more explicit about problems
 
 * 1.9.0 (2012-07-13)
 
diff --git a/vendor/twig/twig/doc/filters/number_format.rst b/vendor/twig/twig/doc/filters/number_format.rst
index ccc8f2f..b591b1e 100644
--- a/vendor/twig/twig/doc/filters/number_format.rst
+++ b/vendor/twig/twig/doc/filters/number_format.rst
@@ -16,7 +16,7 @@ separator using the additional arguments:
 
 .. code-block:: jinja
 
-    {{ 9800.333|number_format(2, ',', '.') }}
+    {{ 9800.333|number_format(2, '.', ',') }}
 
 If no formatting options are provided then Twig will use the default formatting
 options of:
@@ -30,7 +30,7 @@ These defaults can be easily changed through the core extension:
 .. code-block:: php
 
     $twig = new Twig_Environment($loader);
-    $twig->getExtension('core')->setNumberFormat(3, ',', '.');
+    $twig->getExtension('core')->setNumberFormat(3, '.', ',');
 
 The defaults set for ``number_format`` can be over-ridden upon each call using the
 additional parameters.
diff --git a/vendor/twig/twig/doc/recipes.rst b/vendor/twig/twig/doc/recipes.rst
index 5f98504..41540f2 100644
--- a/vendor/twig/twig/doc/recipes.rst
+++ b/vendor/twig/twig/doc/recipes.rst
@@ -328,7 +328,7 @@ you have some dynamic JavaScript files thanks to the ``autoescape`` tag:
 
 .. code-block:: jinja
 
-    {% autoescape js %}
+    {% autoescape 'js' %}
         ... some JS ...
     {% endautoescape %}
 
diff --git a/vendor/twig/twig/doc/templates.rst b/vendor/twig/twig/doc/templates.rst
index cf6d19d..c37e5c6 100644
--- a/vendor/twig/twig/doc/templates.rst
+++ b/vendor/twig/twig/doc/templates.rst
@@ -74,6 +74,15 @@ properties of a PHP object, or items of a PHP array), or the so-called
     {{ foo.bar }}
     {{ foo['bar'] }}
 
+When the attribute contains special characters (like ``-`` that would be
+interpreted as the minus operator), use the ``attribute`` function instead to
+access the variable attribute:
+
+.. code-block:: jinja
+
+    {# equivalent to the non-working foo.data-foo #}
+    {{ attribute(foo, 'data-foo') }}
+
 .. note::
 
     It's important to know that the curly braces are *not* part of the
diff --git a/vendor/twig/twig/doc/tests/empty.rst b/vendor/twig/twig/doc/tests/empty.rst
index 0d1eb32..e5b5599 100644
--- a/vendor/twig/twig/doc/tests/empty.rst
+++ b/vendor/twig/twig/doc/tests/empty.rst
@@ -5,7 +5,7 @@
 
 .. code-block:: jinja
 
-    {# evaluates to true if the foo variable is null, false, or the empty string #}
+    {# evaluates to true if the foo variable is null, false, an empty array, or the empty string #}
     {% if foo is empty %}
         ...
     {% endif %}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Debug.php b/vendor/twig/twig/lib/Twig/Extension/Debug.php
index 8059df0..3dc4d2d 100644
--- a/vendor/twig/twig/lib/Twig/Extension/Debug.php
+++ b/vendor/twig/twig/lib/Twig/Extension/Debug.php
@@ -17,7 +17,7 @@ class Twig_Extension_Debug extends Twig_Extension
      */
     public function getFunctions()
     {
-        // dump is safe if var_dump is overriden by xdebug
+        // dump is safe if var_dump is overridden by xdebug
         $isDumpOutputHtmlSafe = extension_loaded('xdebug')
             // false means that it was not set (and the default is on) or it explicitly enabled
             && (false === ini_get('xdebug.overload_var_dump') || ini_get('xdebug.overload_var_dump'))
diff --git a/vendor/twig/twig/lib/Twig/Loader/Chain.php b/vendor/twig/twig/lib/Twig/Loader/Chain.php
index a044905..b6b0ce9 100644
--- a/vendor/twig/twig/lib/Twig/Loader/Chain.php
+++ b/vendor/twig/twig/lib/Twig/Loader/Chain.php
@@ -51,14 +51,16 @@ class Twig_Loader_Chain implements Twig_LoaderInterface
      */
     public function getSource($name)
     {
+        $exceptions = array();
         foreach ($this->loaders as $loader) {
             try {
                 return $loader->getSource($name);
             } catch (Twig_Error_Loader $e) {
+                $exceptions[] = $e->getMessage();
             }
         }
 
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
+        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined (%s).', $name, implode(', ', $exceptions)));
     }
 
     /**
@@ -70,14 +72,16 @@ class Twig_Loader_Chain implements Twig_LoaderInterface
      */
     public function getCacheKey($name)
     {
+        $exceptions = array();
         foreach ($this->loaders as $loader) {
             try {
                 return $loader->getCacheKey($name);
             } catch (Twig_Error_Loader $e) {
+                $exceptions[] = get_class($loader).': '.$e->getMessage();
             }
         }
 
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
+        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined (%s).', $name, implode(' ', $exceptions)));
     }
 
     /**
@@ -88,13 +92,15 @@ class Twig_Loader_Chain implements Twig_LoaderInterface
      */
     public function isFresh($name, $time)
     {
+        $exceptions = array();
         foreach ($this->loaders as $loader) {
             try {
                 return $loader->isFresh($name, $time);
             } catch (Twig_Error_Loader $e) {
+                $exceptions[] = get_class($loader).': '.$e->getMessage();
             }
         }
 
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
+        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined (%s).', $name, implode(' ', $exceptions)));
     }
 }
diff --git a/vendor/twig/twig/lib/Twig/Template.php b/vendor/twig/twig/lib/Twig/Template.php
index 7ecdba4..7b98468 100644
--- a/vendor/twig/twig/lib/Twig/Template.php
+++ b/vendor/twig/twig/lib/Twig/Template.php
@@ -284,7 +284,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
      * This method is for internal use only and should never be called
      * directly.
      *
-     * This method should not be overriden in a sub-class as this is an
+     * This method should not be overridden in a sub-class as this is an
      * implementation detail that has been introduced to optimize variable
      * access for versions of PHP before 5.4. This is not a way to override
      * the way to get a variable value.
diff --git a/vendor/twig/twig/test/Twig/Tests/escapingTest.php b/vendor/twig/twig/test/Twig/Tests/escapingTest.php
index 65c38ab..2492b3a 100644
--- a/vendor/twig/twig/test/Twig/Tests/escapingTest.php
+++ b/vendor/twig/twig/test/Twig/Tests/escapingTest.php
@@ -22,10 +22,6 @@ class Twig_Test_EscapingTest extends PHPUnit_Framework_TestCase
 
     protected $htmlAttrSpecialChars = array(
         '\''    => '&#x27;',
-        '"'     => '&quot;',
-        '<'     => '&lt;',
-        '>'     => '&gt;',
-        '&'     => '&amp;',
         /* Characters beyond ASCII value 255 to unicode escape */
         'Ā'     => '&#x0100;',
         /* Immune chars excluded */
diff --git a/web/bundles/ivoryckeditor/ckeditor.js b/web/bundles/ivoryckeditor/ckeditor.js
index 3920f16..607feee 100644
--- a/web/bundles/ivoryckeditor/ckeditor.js
+++ b/web/bundles/ivoryckeditor/ckeditor.js
@@ -50,7 +50,7 @@ w.push('</tr></table>');return w.join('');};function s(t){return t.getAttribute(
 if(q!==undefined)this.setValue(q);};function n(){var o;for(var p=0;p<arguments.length;p++){if(arguments[p] instanceof h){o=arguments[p];break;}}if(o){var q=this.att,r=this.getValue();if(r)o.setAttribute(q,r);else o.removeAttribute(q,r);}};j.add('dialogadvtab',{createAdvancedTab:function(o,p){if(!p)p={id:1,dir:1,classes:1,styles:1};var q=o.lang.common,r={id:'advanced',label:q.advancedTab,title:q.advancedTab,elements:[{type:'vbox',padding:1,children:[]}]},s=[];if(p.id||p.dir){if(p.id)s.push({id:'advId',att:'id',type:'text',label:q.id,setup:m,commit:n});if(p.dir)s.push({id:'advLangDir',att:'dir',type:'select',label:q.langDir,'default':'',style:'width:100%',items:[[q.notSet,''],[q.langDirLTR,'ltr'],[q.langDirRTL,'rtl']],setup:m,commit:n});r.elements[0].children.push({type:'hbox',widths:['50%','50%'],children:[].concat(s)});}if(p.styles||p.classes){s=[];if(p.styles)s.push({id:'advStyles',att:'style',type:'text',label:q.styles,'default':'',validate:a.dialog.validate.inlineStyle(q.invalidInlineStyle),onChange:function(){},getStyle:function(t,u){var v=this.getValue().match(new RegExp(t+'\\s*:\\s*([^;]*)','i'));return v?v[1]:u;},updateStyle:function(t,u){var v=this.getValue();if(v)v=v.replace(new RegExp('\\s*'+t+'s*:[^;]*(?:$|;s*)','i'),'').replace(/^[;\s]+/,'').replace(/\s+$/,'');if(u){v&&!/;\s*$/.test(v)&&(v+='; ');v+=t+': '+u;}this.setValue(v,1);},setup:m,commit:n});if(p.classes)s.push({type:'hbox',widths:['45%','55%'],children:[{id:'advCSSClasses',att:'class',type:'text',label:q.cssClasses,'default':'',setup:m,commit:n}]});r.elements[0].children.push({type:'hbox',widths:['50%','50%'],children:[].concat(s)});}return r;}});})();(function(){j.add('div',{requires:['editingblock','domiterator','styles'],init:function(m){var n=m.lang.div;m.addCommand('creatediv',new a.dialogCommand('creatediv'));m.addCommand('editdiv',new a.dialogCommand('editdiv'));m.addCommand('removediv',{exec:function(o){var p=o.getSelection(),q=p&&p.getRanges(),r,s=p.createBookmarks(),t,u=[];function v(x){var y=new d.elementPath(x),z=y.blockLimit,A=z.is('div')&&z;if(A&&!A.data('cke-div-added')){u.push(A);A.data('cke-div-added');}};for(var w=0;w<q.length;w++){r=q[w];if(r.collapsed)v(p.getStartElement());else{t=new d.walker(r);t.evaluator=v;t.lastForward();}}for(w=0;w<u.length;w++)u[w].remove(true);p.selectBookmarks(s);}});m.ui.addButton('CreateDiv',{label:n.toolbar,command:'creatediv'});if(m.addMenuItems){m.addMenuItems({editdiv:{label:n.edit,command:'editdiv',group:'div',order:1},removediv:{label:n.remove,command:'removediv',group:'div',order:5}});
 if(m.contextMenu)m.contextMenu.addListener(function(o,p){if(!o||o.isReadOnly())return null;var q=new d.elementPath(o),r=q.blockLimit;if(r&&r.getAscendant('div',true))return{editdiv:2,removediv:2};return null;});}a.dialog.add('creatediv',this.path+'dialogs/div.js');a.dialog.add('editdiv',this.path+'dialogs/div.js');}});})();(function(){var m={toolbarFocus:{editorFocus:false,readOnly:1,exec:function(o){var p=o._.elementsPath.idBase,q=a.document.getById(p+'0');q&&q.focus(c||b.air);}}},n='<span class="cke_empty">&nbsp;</span>';j.add('elementspath',{requires:['selection'],init:function(o){var p='cke_path_'+o.name,q,r=function(){if(!q)q=a.document.getById(p);return q;},s='cke_elementspath_'+e.getNextNumber()+'_';o._.elementsPath={idBase:s,filters:[]};o.on('themeSpace',function(x){if(x.data.space=='bottom')x.data.html+='<span id="'+p+'_label" class="cke_voice_label">'+o.lang.elementsPath.eleLabel+'</span>'+'<div id="'+p+'" class="cke_path" role="group" aria-labelledby="'+p+'_label">'+n+'</div>';});function t(x){o.focus();var y=o._.elementsPath.list[x];if(y.is('body')){var z=new d.range(o.document);z.selectNodeContents(y);z.select();}else o.getSelection().selectElement(y);};var u=e.addFunction(t),v=e.addFunction(function(x,y){var z=o._.elementsPath.idBase,A;y=new d.event(y);var B=o.lang.dir=='rtl';switch(y.getKeystroke()){case B?39:37:case 9:A=a.document.getById(z+(x+1));if(!A)A=a.document.getById(z+'0');A.focus();return false;case B?37:39:case 2228224+9:A=a.document.getById(z+(x-1));if(!A)A=a.document.getById(z+(o._.elementsPath.list.length-1));A.focus();return false;case 27:o.focus();return false;case 13:case 32:t(x);return false;}return true;});o.on('selectionChange',function(x){var y=b,z=x.data.selection,A=z.getStartElement(),B=[],C=x.editor,D=C._.elementsPath.list=[],E=C._.elementsPath.filters;while(A){var F=0,G;if(A.data('cke-display-name'))G=A.data('cke-display-name');else if(A.data('cke-real-element-type'))G=A.data('cke-real-element-type');else G=A.getName();for(var H=0;H<E.length;H++){var I=E[H](A,G);if(I===false){F=1;break;}G=I||G;}if(!F){var J=D.push(A)-1,K='';if(y.opera||y.gecko&&y.mac)K+=' onkeypress="return false;"';if(y.gecko)K+=' onblur="this.style.cssText = this.style.cssText;"';var L=C.lang.elementsPath.eleTitle.replace(/%1/,G);B.unshift('<a id="',s,J,'" href="javascript:void(\'',G,'\')" tabindex="-1" title="',L,'"'+(b.gecko&&b.version<10900?' onfocus="event.preventBubble();"':'')+' hidefocus="true" '+' onkeydown="return CKEDITOR.tools.callFunction(',v,',',J,', event );"'+K,' onclick="CKEDITOR.tools.callFunction('+u,',',J,'); return false;"',' role="button" aria-labelledby="'+s+J+'_label">',G,'<span id="',s,J,'_label" class="cke_label">'+L+'</span>','</a>');
 }if(G=='body')break;A=A.getParent();}var M=r();M.setHtml(B.join('')+n);C.fire('elementsPathUpdate',{space:M});});function w(){q&&q.setHtml(n);delete o._.elementsPath.list;};o.on('readOnly',w);o.on('contentDomUnload',w);o.addCommand('elementsPathFocus',m.toolbarFocus);}});})();(function(){j.add('enterkey',{requires:['keystrokes','indent'],init:function(t){t.addCommand('enter',{modes:{wysiwyg:1},editorFocus:false,exec:function(v){r(v);}});t.addCommand('shiftEnter',{modes:{wysiwyg:1},editorFocus:false,exec:function(v){q(v);}});var u=t.keystrokeHandler.keystrokes;u[13]='enter';u[2228224+13]='shiftEnter';}});j.enterkey={enterBlock:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=v.checkStartOfBlock(),z=v.checkEndOfBlock(),A=new d.elementPath(v.startContainer),B=A.block;if(y&&z){if(B&&(B.is('li')||B.getParent().is('li'))){t.execCommand('outdent');return;}if(B&&B.getParent().is('blockquote')){B.breakParent(B.getParent());if(!B.getPrevious().getFirst(d.walker.invisible(1)))B.getPrevious().remove();if(!B.getNext().getFirst(d.walker.invisible(1)))B.getNext().remove();v.moveToElementEditStart(B);v.select();return;}}else if(B&&B.is('pre')){if(!z){n(t,u,v,w);return;}}else if(B&&f.$captionBlock[B.getName()]){n(t,u,v,w);return;}var C=u==3?'div':'p',D=v.splitBlock(C);if(!D)return;var E=D.previousBlock,F=D.nextBlock,G=D.wasStartOfBlock,H=D.wasEndOfBlock,I;if(F){I=F.getParent();if(I.is('li')){F.breakParent(I);F.move(F.getNext(),1);}}else if(E&&(I=E.getParent())&&I.is('li')){E.breakParent(I);I=E.getNext();v.moveToElementEditStart(I);E.move(E.getPrevious());}if(!G&&!H){if(F.is('li')&&(I=F.getFirst(d.walker.invisible(true)))&&I.is&&I.is('ul','ol'))(c?x.createText('\xa0'):x.createElement('br')).insertBefore(I);if(F)v.moveToElementEditStart(F);}else{var J,K;if(E){if(E.is('li')||!(p.test(E.getName())||E.is('pre')))J=E.clone();}else if(F)J=F.clone();if(!J){if(I&&I.is('li'))J=I;else{J=x.createElement(C);if(E&&(K=E.getDirection()))J.setAttribute('dir',K);}}else if(w&&!J.is('li'))J.renameNode(C);var L=D.elementPath;if(L)for(var M=0,N=L.elements.length;M<N;M++){var O=L.elements[M];if(O.equals(L.block)||O.equals(L.blockLimit))break;if(f.$removeEmpty[O.getName()]){O=O.clone();J.moveChildren(O);J.append(O);}}if(!c)J.appendBogus();if(!J.getParent())v.insertNode(J);J.is('li')&&J.removeAttribute('value');if(c&&G&&(!H||!E.getChildCount())){v.moveToElementEditStart(H?E:J);v.select();}v.moveToElementEditStart(G&&!H?F:J);}if(!c)if(F){var P=x.createElement('span');P.setHtml('&nbsp;');v.insertNode(P);
-P.scrollIntoView();v.deleteContents();}else J.scrollIntoView();v.select();},enterBr:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=u==3?'div':'p',z=v.checkEndOfBlock(),A=new d.elementPath(t.getSelection().getStartElement()),B=A.block,C=B&&A.block.getName(),D=false;if(!w&&C=='li'){o(t,u,v,w);return;}if(!w&&z&&p.test(C)){var E,F;if(F=B.getDirection()){E=x.createElement('div');E.setAttribute('dir',F);E.insertAfter(B);v.setStart(E,0);}else{x.createElement('br').insertAfter(B);if(b.gecko)x.createText('').insertAfter(B);v.setStartAt(B.getNext(),c?3:1);}}else{var G;D=C=='pre';if(D&&!b.gecko)G=x.createText(c?'\r':'\n');else G=x.createElement('br');v.deleteContents();v.insertNode(G);if(c)v.setStartAt(G,4);else{x.createText('\ufeff').insertAfter(G);if(z)G.getParent().appendBogus();G.getNext().$.nodeValue='';v.setStartAt(G.getNext(),1);var H=null;if(!b.gecko){H=x.createElement('span');H.setHtml('&nbsp;');}else H=x.createElement('br');H.insertBefore(G.getNext());H.scrollIntoView();H.remove();}}v.collapse(true);v.select(D);}};var m=j.enterkey,n=m.enterBr,o=m.enterBlock,p=/^h[1-6]$/;function q(t){if(t.mode!='wysiwyg')return false;return r(t,t.config.shiftEnterMode,1);};function r(t,u,v){v=t.config.forceEnterMode||v;if(t.mode!='wysiwyg')return false;if(!u)u=t.config.enterMode;setTimeout(function(){t.fire('saveSnapshot');if(u==2)n(t,u,null,v);else o(t,u,null,v);t.fire('saveSnapshot');},0);return true;};function s(t){var u=t.getSelection().getRanges(true);for(var v=u.length-1;v>0;v--)u[v].deleteContents();return u[0];};})();(function(){var m='nbsp,gt,lt,amp',n='quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro',o='Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml',p='Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv';
+P.scrollIntoView();v.deleteContents();}else J.scrollIntoView();v.select();},enterBr:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=u==3?'div':'p',z=v.checkEndOfBlock(),A=new d.elementPath(t.getSelection().getStartElement()),B=A.block,C=B&&A.block.getName(),D=false;if(!w&&C=='li'){o(t,u,v,w);return;}if(!w&&z&&p.test(C)){var E,F;if(F=B.getDirection()){E=x.createElement('div');E.setAttribute('dir',F);E.insertAfter(B);v.setStart(E,0);}else{x.createElement('br').insertAfter(B);if(b.gecko)x.createText('').insertAfter(B);v.setStartAt(B.getNext(),c?3:1);}}else{var G;D=C=='pre';if(D&&!b.gecko)G=x.createText(c?'\r':'\n');else G=x.createElement('br');v.deleteContents();v.insertNode(G);if(c)v.setStartAt(G,4);else{x.createText('\ufeff').insertAfter(G);if(z)G.getParent().appendBogus();G.getNext().$.nodeValue='';v.setStartAt(G.getNext(),1);var H=null;if(!b.gecko){H=x.createElement('span');H.setHtml('&nbsp;');}else H=x.createElement('br');H.insertBefore(G.getNext());H.scrollIntoView();H.remove();}}v.collapse(true);v.select(D);}};var m=j.enterkey,n=m.enterBr,o=m.enterBlock,p=/^h[1-6]$/;function q(t){if(t.mode!='wysiwyg')return false;return r(t,t.config.shiftEnterMode,1);};function r(t,u,v){v=t.config.forceEnterMode||v;if(t.mode!='wysiwyg')return false;if(!u)u=t.config.enterMode;setTimeout(function(){t.fire('saveSnapshot');if(u==2)n(t,u,null,v);else o(t,u,null,v);t.fire('saveSnapshot');},0);return true;};function s(t){var u=t.getSelection().getRanges(true);for(var v=u.length-1;v>0;v--)u[v].deleteContents();return u[0];};})();(function(){var m='nbsp,gt,lt,amp',n='quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro',o='Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml',p='Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv,ohungarumlaut,Ohungarumlaut,uhungarumlaut,Uhungarumlaut';
 function q(r,s){var t={},u=[],v={nbsp:'\xa0',shy:'­',gt:'>',lt:'<',amp:'&'};r=r.replace(/\b(nbsp|shy|gt|lt|amp)(?:,|$)/g,function(A,B){var C=s?'&'+B+';':v[B],D=s?v[B]:'&'+B+';';t[C]=D;u.push(C);return '';});if(!s&&r){r=r.split(',');var w=document.createElement('div'),x;w.innerHTML='&'+r.join(';&')+';';x=w.innerHTML;w=null;for(var y=0;y<x.length;y++){var z=x.charAt(y);t[z]='&'+r[y]+';';u.push(z);}}t.regex=u.join(s?'|':'');return t;};j.add('entities',{afterInit:function(r){var s=r.config,t=r.dataProcessor,u=t&&t.htmlFilter;if(u){var v='';if(s.basicEntities!==false)v+=m;if(s.entities){v+=','+n;if(s.entities_latin)v+=','+o;if(s.entities_greek)v+=','+p;if(s.entities_additional)v+=','+s.entities_additional;}var w=q(v),x=w.regex?'['+w.regex+']':'a^';delete w.regex;if(s.entities&&s.entities_processNumerical)x='[^ -~]|'+x;x=new RegExp(x,'g');function y(C){return s.entities_processNumerical=='force'||!w[C]?'&#'+C.charCodeAt(0)+';':w[C];};var z=q([m,'shy'].join(','),true),A=new RegExp(z.regex,'g');function B(C){return z[C];};u.addRules({text:function(C){return C.replace(A,B).replace(x,y);}});}}});})();i.basicEntities=true;i.entities=true;i.entities_latin=true;i.entities_greek=true;i.entities_additional='#39';(function(){function m(v,w){var x=[];if(!w)return v;else for(var y in w)x.push(y+'='+encodeURIComponent(w[y]));return v+(v.indexOf('?')!=-1?'&':'?')+x.join('&');};function n(v){v+='';var w=v.charAt(0).toUpperCase();return w+v.substr(1);};function o(v){var C=this;var w=C.getDialog(),x=w.getParentEditor();x._.filebrowserSe=C;var y=x.config['filebrowser'+n(w.getName())+'WindowWidth']||x.config.filebrowserWindowWidth||'80%',z=x.config['filebrowser'+n(w.getName())+'WindowHeight']||x.config.filebrowserWindowHeight||'70%',A=C.filebrowser.params||{};A.CKEditor=x.name;A.CKEditorFuncNum=x._.filebrowserFn;if(!A.langCode)A.langCode=x.langCode;var B=m(C.filebrowser.url,A);x.popup(B,y,z,x.config.filebrowserWindowFeatures||x.config.fileBrowserWindowFeatures);};function p(v){var y=this;var w=y.getDialog(),x=w.getParentEditor();x._.filebrowserSe=y;if(!w.getContentElement(y['for'][0],y['for'][1]).getInputElement().$.value)return false;if(!w.getContentElement(y['for'][0],y['for'][1]).getAction())return false;return true;};function q(v,w,x){var y=x.params||{};y.CKEditor=v.name;y.CKEditorFuncNum=v._.filebrowserFn;if(!y.langCode)y.langCode=v.langCode;w.action=m(x.url,y);w.filebrowser=x;};function r(v,w,x,y){var z,A;for(var B in y){z=y[B];if(z.type=='hbox'||z.type=='vbox')r(v,w,x,z.children);
 if(!z.filebrowser)continue;if(typeof z.filebrowser=='string'){var C={action:z.type=='fileButton'?'QuickUpload':'Browse',target:z.filebrowser};z.filebrowser=C;}if(z.filebrowser.action=='Browse'){var D=z.filebrowser.url;if(D===undefined){D=v.config['filebrowser'+n(w)+'BrowseUrl'];if(D===undefined)D=v.config.filebrowserBrowseUrl;}if(D){z.onClick=o;z.filebrowser.url=D;z.hidden=false;}}else if(z.filebrowser.action=='QuickUpload'&&z['for']){D=z.filebrowser.url;if(D===undefined){D=v.config['filebrowser'+n(w)+'UploadUrl'];if(D===undefined)D=v.config.filebrowserUploadUrl;}if(D){var E=z.onClick;z.onClick=function(F){var G=F.sender;if(E&&E.call(G,F)===false)return false;return p.call(G,F);};z.filebrowser.url=D;z.hidden=false;q(v,x.getContents(z['for'][0]).get(z['for'][1]),z.filebrowser);}}}};function s(v,w){var x=w.getDialog(),y=w.filebrowser.target||null;v=v.replace(/#/g,'%23');if(y){var z=y.split(':'),A=x.getContentElement(z[0],z[1]);if(A){A.setValue(v);x.selectPage(z[0]);}}};function t(v,w,x){if(x.indexOf(';')!==-1){var y=x.split(';');for(var z=0;z<y.length;z++){if(t(v,w,y[z]))return true;}return false;}var A=v.getContents(w).get(x).filebrowser;return A&&A.url;};function u(v,w){var A=this;var x=A._.filebrowserSe.getDialog(),y=A._.filebrowserSe['for'],z=A._.filebrowserSe.filebrowser.onSelect;if(y)x.getContentElement(y[0],y[1]).reset();if(typeof w=='function'&&w.call(A._.filebrowserSe)===false)return;if(z&&z.call(A._.filebrowserSe,v,w)===false)return;if(typeof w=='string'&&w)alert(w);if(v)s(v,A._.filebrowserSe);};j.add('filebrowser',{init:function(v,w){v._.filebrowserFn=e.addFunction(u,v);v.on('destroy',function(){e.removeFunction(this._.filebrowserFn);});}});a.on('dialogDefinition',function(v){var w=v.data.definition,x;for(var y in w.contents){if(x=w.contents[y]){r(v.editor,v.data.name,w,x.elements);if(x.hidden&&x.filebrowser)x.hidden=!t(w,x.id,x.filebrowser);}}});})();j.add('find',{init:function(m){var n=j.find;m.ui.addButton('Find',{label:m.lang.findAndReplace.find,command:'find'});var o=m.addCommand('find',new a.dialogCommand('find'));o.canUndo=false;o.readOnly=1;m.ui.addButton('Replace',{label:m.lang.findAndReplace.replace,command:'replace'});var p=m.addCommand('replace',new a.dialogCommand('replace'));p.canUndo=false;a.dialog.add('find',this.path+'dialogs/find.js');a.dialog.add('replace',this.path+'dialogs/find.js');},requires:['styles']});i.find_highlight={element:'span',styles:{'background-color':'#004',color:'#fff'}};(function(){var m=/\.swf(?:$|\?)/i;function n(p){var q=p.attributes;
 return q.type=='application/x-shockwave-flash'||m.test(q.src||'');};function o(p,q){return p.createFakeParserElement(q,'cke_flash','flash',true);};j.add('flash',{init:function(p){p.addCommand('flash',new a.dialogCommand('flash'));p.ui.addButton('Flash',{label:p.lang.common.flash,command:'flash'});a.dialog.add('flash',this.path+'dialogs/flash.js');p.addCss('img.cke_flash{background-image: url('+a.getUrl(this.path+'images/placeholder.png')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 80px;'+'height: 80px;'+'}');if(p.addMenuItems)p.addMenuItems({flash:{label:p.lang.flash.properties,command:'flash',group:'flash'}});p.on('doubleclick',function(q){var r=q.data.element;if(r.is('img')&&r.data('cke-real-element-type')=='flash')q.data.dialog='flash';});if(p.contextMenu)p.contextMenu.addListener(function(q,r){if(q&&q.is('img')&&!q.isReadOnly()&&q.data('cke-real-element-type')=='flash')return{flash:2};});},afterInit:function(p){var q=p.dataProcessor,r=q&&q.dataFilter;if(r)r.addRules({elements:{'cke:object':function(s){var t=s.attributes,u=t.classid&&String(t.classid).toLowerCase();if(!u&&!n(s)){for(var v=0;v<s.children.length;v++){if(s.children[v].name=='cke:embed'){if(!n(s.children[v]))return null;return o(p,s);}}return null;}return o(p,s);},'cke:embed':function(s){if(!n(s))return null;return o(p,s);}}},5);},requires:['fakeobjects']});})();e.extend(i,{flashEmbedTagOnly:false,flashAddEmbedTag:true,flashConvertOnEdit:false});(function(){function m(n,o,p,q,r,s,t){var u=n.config,v=r.split(';'),w=[],x={};for(var y=0;y<v.length;y++){var z=v[y];if(z){z=z.split('/');var A={},B=v[y]=z[0];A[p]=w[y]=z[1]||B;x[B]=new a.style(t,A);x[B]._.definition.name=B;}else v.splice(y--,1);}n.ui.addRichCombo(o,{label:q.label,title:q.panelTitle,className:'cke_'+(p=='size'?'fontSize':'font'),panel:{css:n.skin.editor.css.concat(u.contentsCss),multiSelect:false,attributes:{'aria-label':q.panelTitle}},init:function(){this.startGroup(q.panelTitle);for(var C=0;C<v.length;C++){var D=v[C];this.add(D,x[D].buildPreview(),D);}},onClick:function(C){n.focus();n.fire('saveSnapshot');var D=x[C];if(this.getValue()==C)D.remove(n.document);else D.apply(n.document);n.fire('saveSnapshot');},onRender:function(){n.on('selectionChange',function(C){var D=this.getValue(),E=C.data.path,F=E.elements;for(var G=0,H;G<F.length;G++){H=F[G];for(var I in x){if(x[I].checkElementRemovable(H,true)){if(I!=D)this.setValue(I);return;}}}this.setValue('',s);},this);}});
diff --git a/web/bundles/ivoryckeditor/config.js b/web/bundles/ivoryckeditor/config.js
index fde512c..6e1a1ee 100644
--- a/web/bundles/ivoryckeditor/config.js
+++ b/web/bundles/ivoryckeditor/config.js
@@ -6,6 +6,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 CKEDITOR.editorConfig = function( config )
 {
 	// Define changes to default configuration here. For example:
-	// config.language = 'fr';
-	// config.uiColor = '#AADC6E';
+	config.language = 'hu';
+	config.uiColor = '#3366ff';
+	config.htmlEncodeOutput = false;
+	config.entities = false;
+	//config.smileypath = '';
+	//config.contentCss = '';
 };