Fix render for Symfony 2.2
Update Resources/doc/reference/query_proxy.rst
Merge pull request #168 from silentinet/patch-1

Update Resources/doc/reference/query_proxy.rst
DBALException catch added to batchDelete and delete
DBALException use statement added
Merge pull request #170 from robertdolca/master

DBALException catch added to batchDelete and delete
Trigger event when appending form element
Route name and parameters option added
Conflicts:
	Model/ModelManager.php
Some text left behind removed
Merge pull request #172 from EmmanuelVella/patch-4

Trigger event when appending form element
fix deprecated calls
Fix bug when use multiple ChoiceFilter with integer values in choices array.
Merge pull request #175 from gimler/fix_deprecated_calls

fix deprecated calls
Merge pull request #176 from suslin/choice-filter-mulptiple-fix

Fix bug when use multiple ChoiceFilter with integer values in choices ar...
Merge remote-tracking branch 'upstream/master'
Fix some phpdocs
Fix SonataIntlBundle detection
Update PHPUnit autoload to use the symfony installation if present
Fix some phpdocs