Merge origin/master

Conflicts:
	web/Vista/Dgp/Reg_Dgp.jsp