Intento doctrine2
Merge branch 'master' of https://github.com/pmprete/la-paz