gg
Merge origin/master

Conflicts:
	web/Vista/Contrato/Reg_Contrato.jsp