Migrates the EJB calendar to CDI
Fix some issues with the import of Admin