Creada logica de interfaz Desguace
Merge branch 'master' of https://github.com/franbn14/SORPAPETEAM

Conflicts:
	DesguaceJava/nbproject/private/private.xml