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
Replace deprecased jQuery .live and .die methods

.live and .die methods are removed from jQuery 1.9.x .
Replaced:
.live -> .on
.die -> .off

SonataAdminBundle is valid with jQuery 1.9.x, SonataDoctrineORMAdminBundle not.
Update composer.json
Update composer.json file
Merge pull request #183 from dkorsak/patch-1

Replace deprecased jQuery 1.9 .live and .die methods
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.