findNeighbours modified
modified findNeigh 3D
Merge branch 'sviluppo_3D'

Conflicts:
	test/CMakeLists.txt