GG
Merge origin/master
Merge origin/master
GG
Merge origin/master

Conflicts:
	web/Vista/Dgp/Reg_Dgp.jsp