Merge branch 'Solfamidas'
Removed duplicate empleadoDao
Merge branch 'master'