Fix render for Symfony 2.2
Merge remote-tracking branch 'upstream/master'
Fix some phpdocs
Fix SonataIntlBundle detection
Update PHPUnit autoload to use the symfony installation if present
Removed '__hack_doctrine_orm__'
Removed extra spaces
Apply PHP-CS-Fixer
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DependencyInjection/Compiler/AddTemplatesCompilerPass.php
Merge pull request #180 from miklos-martin/master

Removed '__hack_doctrine_orm__'
fixed old annotation syntax defining_entities.rst

The "@Validation:" syntax is no longer supported.
Typo : From vs. Form
Merge pull request #182 from alex-devg/patch-1

Typo : From vs. Form
Merge pull request #181 from sstok/patch-1

fixed old annotation syntax defining_entities.rst
Use branch alias
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 file
Update composer.json
Update composer.json file
Merge pull request #183 from dkorsak/patch-1

Replace deprecased jQuery 1.9 .live and .die methods