Trabajo Victor Algarin 20/12/2013
Trabajo Victor Algarin 20/12/2013
Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-war/nbproject/project.properties
	DesignerRHN/DesignerRHN-war/src/java/Validaciones/Validar.java
	DesignerRHN/nbproject/project.properties
Merge origin/master