H3
Merge branch 'origin/Stabilo_ListarEmpleados'

Conflicts:
	src/main/webapp/WEB-INF/pages/empleado/new.jsp
Merge branch 'origin/Stabilo_ListarEmpleados'
Merge branch 'origin/Stabilo_ListarEmpleados'
idioma
Merge branch 'origin/Stabilo_ListarEmpleados'