Merge pull request #13 from rockamorales/master

merge
Linea XD
Merge branch 'master' of github.com:mackk/ClinicaEJB.git
Merge pull request #112 from mackk/master

EJB mod