cambios personales
Merge branch 'master' of
https://github.com/linoespinoza/trabajo-grupal-gestores.git

Conflicts:
	WebContent/js/app/mantenimientoCentroFormacion.js
Merge branch 'master' of
https://github.com/linoespinoza/trabajo-grupal-gestores.git

Conflicts:
	WebContent/jsp/principal.jsp
	src/gestores/dao/IdeaDAO.java
	src/gestores/negocio/GestionIdea.java