Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-ejb/src/java/Administrar/AdministrarDetallesEmpresas.java
	DesignerRHN/DesignerRHN-ejb/src/java/Entidades/Paises.java
Merge origin/master