Merge pull request #1 from Anteo4Ever/dev

-Corregido los errores al usar el JPA que no permitian modificar la base...
Merge pull request #2 from Anteo4Ever/dev

Dev
22.06.2013
Merge pull request #4 from Anteo4Ever/devAle

Dev ale