Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-ejb/nbproject/project.properties
	DesignerRHN/DesignerRHN-ejb/src/java/Administrar/AdministrarCentroCostos.java
	DesignerRHN/DesignerRHN-ejb/src/java/Entidades/SoActosInseguros.java
	DesignerRHN/DesignerRHN-ejb/src/java/InterfaceAdministrar/AdministrarCentroCostosInterface.java
	DesignerRHN/DesignerRHN-war/nbproject/faces-config.NavData
	DesignerRHN/DesignerRHN-war/nbproject/project.properties
	DesignerRHN/DesignerRHN-war/web/centrocosto.xhtml
	DesignerRHN/nbproject/project.properties
Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-ejb/nbproject/project.properties
	DesignerRHN/DesignerRHN-ejb/src/java/Administrar/AdministrarCentroCostos.java
	DesignerRHN/DesignerRHN-ejb/src/java/Entidades/SoActosInseguros.java
	DesignerRHN/DesignerRHN-ejb/src/java/InterfaceAdministrar/AdministrarCentroCostosInterface.java
	DesignerRHN/DesignerRHN-war/nbproject/faces-config.NavData
	DesignerRHN/DesignerRHN-war/nbproject/project.properties
	DesignerRHN/DesignerRHN-war/web/centrocosto.xhtml
	DesignerRHN/nbproject/project.properties
Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-ejb/nbproject/project.properties
	DesignerRHN/DesignerRHN-ejb/src/java/Administrar/AdministrarCentroCostos.java
	DesignerRHN/DesignerRHN-ejb/src/java/Entidades/SoActosInseguros.java
	DesignerRHN/DesignerRHN-ejb/src/java/InterfaceAdministrar/AdministrarCentroCostosInterface.java
	DesignerRHN/DesignerRHN-war/nbproject/faces-config.NavData
	DesignerRHN/DesignerRHN-war/nbproject/project.properties
	DesignerRHN/DesignerRHN-war/web/centrocosto.xhtml
	DesignerRHN/nbproject/project.properties
Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-ejb/nbproject/project.properties
	DesignerRHN/DesignerRHN-ejb/src/java/Administrar/AdministrarCentroCostos.java
	DesignerRHN/DesignerRHN-ejb/src/java/Entidades/SoActosInseguros.java
	DesignerRHN/DesignerRHN-ejb/src/java/InterfaceAdministrar/AdministrarCentroCostosInterface.java
	DesignerRHN/DesignerRHN-war/nbproject/faces-config.NavData
	DesignerRHN/DesignerRHN-war/nbproject/project.properties
	DesignerRHN/DesignerRHN-war/web/centrocosto.xhtml
	DesignerRHN/nbproject/project.properties
Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-war/nbproject/faces-config.NavData
Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-war/nbproject/faces-config.NavData
Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-war/nbproject/faces-config.NavData