Merge branch 'master' of https://github.com/hersftw/prop

Conflicts:
	bin/prop/drivers/driverLlibreria.class
	bin/prop/drivers/driverUbicacio.class
Merge branch 'master' of https://github.com/hersftw/prop

Conflicts:
	bin/prop/domini/ConjuntoNodos.class
	bin/prop/domini/Nodo.class
	bin/prop/drivers/driverLlibreria.class