John Pineda
Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-war/src/java/Controlador/ControlUnidad.java