merged 2.0
merged 2.0

fervo/DoctrineBundle,Soullivaneuh/DoctrineBundle,chrisguitarguy/DoctrineBundle,nicolas-grekas/DoctrineBundle,hason/DoctrineBundle,javiereguiluz/DoctrineBundle,doctrine/DoctrineBundle,OskarStark/DoctrineBundle,skafandri/DoctrineBundle,stof/DoctrineBundle,hacfi/DoctrineBundle,OskarStark/DoctrineBundle,hason/DoctrineBundle,fervo/DoctrineBundle,dunglas/DoctrineBundle,gencer/DoctrineBundle,Soullivaneuh/DoctrineBundle,skafandri/DoctrineBundle,nicolas-grekas/DoctrineBundle,mikeSimonson/DoctrineBundle,hacfi/DoctrineBundle,fabpot/DoctrineBundle,fabpot/DoctrineBundle,gencer/DoctrineBundle,mikeSimonson/DoctrineBundle,lafourchette/DoctrineBundle,chrisguitarguy/DoctrineBundle,javiereguiluz/DoctrineBundle