Fix render for Symfony 2.2
Route name and parameters option added
Conflicts:
	Model/ModelManager.php
Some text left behind removed
Merge remote-tracking branch 'upstream/master'
Fix some phpdocs
Fix SonataIntlBundle detection
Update PHPUnit autoload to use the symfony installation if present
Merge remote-tracking branch 'sonata/master'
documentation for custom route added
documentation for custom route updated
documentation for custom route: code indentation fixed
fixed code-block Resources/doc/reference/audit.rst

The xml code block was displayed wrong because of a missing empty line
Merge pull request #167 from joelwurtz/master

Fix render twig tag for Symfony 2.2
Merge pull request #184 from sstok/patch-2

fixed code-block Resources/doc/reference/audit.rst
ProxyQuery now has fluent interface, similar to the original QueryBuilder.
Fixed some getters.
Merge pull request #192 from imenem/proxy-query-fluent-interface

ProxyQuery now has fluent interface, similar to the original QueryBuilder
Tweak group bouton
Fixed the KnpMenuBundle and Doctrine requirement

There is no reason to forbid the stable KnpMenu version. Fixes #196
And Doctrine is keeping BC so allowing the next releases is safe (and 2.4 is already in beta)
Improve short description preview