Merge origin/master

Conflicts:
	src/java/pe/edu/upeu/application/dao/DgpDAO.java
	src/java/pe/edu/upeu/application/dao/TrabajadorDAO.java
	src/java/pe/edu/upeu/application/web/controller/CDgp.java
	src/java/pe/edu/upeu/application/web/controller/CPrincipal.java
	src/java/pe/edu/upeu/application/web/controller/CTrabajador.java
	web/Generadores/GEN_SP_INSERT.jsp
	web/Vista/Trabajador/Detalle_Trabajador.jsp