entities
entities
Merge branch 'master' of https://github.com/FPierre/hackathon

* 'master' of https://github.com/FPierre/hackathon:
  Import de CocktailBundle dans la conf